Changeset 34247


Ignore:
Timestamp:
2012-11-18T19:52:38+01:00 (5 years ago)
Author:
kaloz
Message:

[generic]: add 3.7-rc6 support (patch 820 still has to be fixed)

Location:
trunk
Files:
1 added
7 deleted
76 edited
2 copied

Legend:

Unmodified
Added
Removed
  • trunk/include/netfilter.mk

    r33518 r34247  
    153153 
    154154# kernel only 
    155 $(eval $(if $(NF_KMOD),$(call nf_add,IPT_NAT,CONFIG_NF_NAT, $(P_V4)nf_nat $(P_V4)iptable_nat),)) 
     155ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.7.0)),1) 
     156  $(eval $(if $(NF_KMOD),$(call nf_add,IPT_NAT,CONFIG_NF_NAT, $(P_XT)nf_nat $(P_V4)iptable_nat),)) 
     157else 
     158  $(eval $(if $(NF_KMOD),$(call nf_add,IPT_NAT,CONFIG_NF_NAT, $(P_V4)nf_nat $(P_V4)iptable_nat),)) 
     159endif 
    156160 
    157161# userland only 
     
    171175$(eval $(call nf_add,IPT_NATHELPER,CONFIG_IP_NF_NAT_FTP, $(P_V4)ip_nat_ftp)) 
    172176$(eval $(call nf_add,IPT_NATHELPER,CONFIG_NF_CONNTRACK_FTP, $(P_XT)nf_conntrack_ftp)) 
    173 $(eval $(call nf_add,IPT_NATHELPER,CONFIG_NF_NAT_FTP, $(P_V4)nf_nat_ftp)) 
     177ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.7.0)),1) 
     178  $(eval $(call nf_add,IPT_NATHELPER,CONFIG_NF_NAT_FTP, $(P_XT)nf_nat_ftp)) 
     179  $(eval $(call nf_add,IPT_NATHELPER,CONFIG_NF_NAT_IRC, $(P_XT)nf_nat_irc)) 
     180else 
     181  $(eval $(call nf_add,IPT_NATHELPER,CONFIG_NF_NAT_FTP, $(P_V4)nf_nat_ftp)) 
     182  $(eval $(call nf_add,IPT_NATHELPER,CONFIG_NF_NAT_IRC, $(P_V4)nf_nat_irc)) 
     183endif 
    174184$(eval $(call nf_add,IPT_NATHELPER,CONFIG_NF_CONNTRACK_IRC, $(P_XT)nf_conntrack_irc)) 
    175 $(eval $(call nf_add,IPT_NATHELPER,CONFIG_NF_NAT_IRC, $(P_V4)nf_nat_irc)) 
    176185 
    177186 
  • trunk/target/linux/generic/config-3.7

    r34227 r34247  
    4545# CONFIG_AR8216_PHY is not set 
    4646# CONFIG_ARCH_AT91 is not set 
     47# CONFIG_ARCH_BCM2835 is not set 
    4748# CONFIG_ARCH_BCMRING is not set 
    4849# CONFIG_ARCH_CLPS711X is not set 
     
    7374# CONFIG_ARCH_MMP is not set 
    7475# CONFIG_ARCH_MSM is not set 
     76# CONFIG_ARCH_MULTIPLATFORM is not set 
    7577# CONFIG_ARCH_MV78XX0 is not set 
    7678# CONFIG_ARCH_MVEBU is not set 
     
    9799# CONFIG_ARCH_SHARK is not set 
    98100# CONFIG_ARCH_SHMOBILE is not set 
     101# CONFIG_ARCH_SIRF is not set 
    99102# CONFIG_ARCH_SOCFPGA is not set 
    100103# CONFIG_ARCH_SUPPORTS_MSI is not set 
     
    120123# CONFIG_ASYNC_TX_DMA is not set 
    121124# CONFIG_AT76C50X_USB is not set 
     125# CONFIG_AT803X_PHY is not set 
    122126# CONFIG_ATA is not set 
    123127# CONFIG_ATALK is not set 
     
    297301# CONFIG_BOOT_PRINTK_DELAY is not set 
    298302CONFIG_BOOT_RAW=y 
     303# CONFIG_BPCTL is not set 
    299304# CONFIG_BPF_JIT is not set 
    300305# CONFIG_BPQETHER is not set 
     
    381386# CONFIG_CC_STACKPROTECTOR is not set 
    382387# CONFIG_CDROM_PKTCDVD is not set 
     388# CONFIG_CED1401 is not set 
    383389# CONFIG_CEPH_FS is not set 
    384390# CONFIG_CEPH_LIB is not set 
     
    430436# CONFIG_CORDIC is not set 
    431437# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set 
     438# CONFIG_COREDUMP is not set 
    432439# CONFIG_CPA_DEBUG is not set 
    433440# CONFIG_CPU_DCACHE_DISABLE is not set 
     
    455462# CONFIG_CRYPTO_AES is not set 
    456463# CONFIG_CRYPTO_AES_586 is not set 
     464# CONFIG_CRYPTO_AES_ARM is not set 
    457465# CONFIG_CRYPTO_AES_NI_INTEL is not set 
    458466# CONFIG_CRYPTO_ALGAPI is not set 
     
    515523# CONFIG_CRYPTO_SERPENT is not set 
    516524# CONFIG_CRYPTO_SHA1 is not set 
     525# CONFIG_CRYPTO_SHA1_ARM is not set 
    517526# CONFIG_CRYPTO_SHA256 is not set 
    518527# CONFIG_CRYPTO_SHA512 is not set 
     
    605614# CONFIG_DEVTMPFS is not set 
    606615# CONFIG_DEVTMPFS_MOUNT is not set 
     616# CONFIG_DGRP is not set 
    607617# CONFIG_DISCONTIGMEM_MANUAL is not set 
    608618# CONFIG_DISPLAY_SUPPORT is not set 
     
    824834# CONFIG_GPIOLIB is not set 
    825835# CONFIG_GPIO_74X164 is not set 
     836# CONFIG_GPIO_ADNP is not set 
    826837# CONFIG_GPIO_ADP5588 is not set 
    827838# CONFIG_GPIO_AMD8111 is not set 
     
    11541165# CONFIG_INTEL_MID_PTI is not set 
    11551166# CONFIG_INTEL_OAKTRAIL is not set 
     1167# CONFIG_INTERVAL_TREE_TEST is not set 
    11561168# CONFIG_IOMMU_SUPPORT is not set 
    11571169# CONFIG_IOSCHED_CFQ is not set 
     
    13731385# CONFIG_LEDS_LM3530 is not set 
    13741386# CONFIG_LEDS_LM3556 is not set 
     1387# CONFIG_LEDS_LM355x is not set 
     1388# CONFIG_LEDS_LM3642 is not set 
    13751389# CONFIG_LEDS_LP3944 is not set 
    13761390# CONFIG_LEDS_LP5521 is not set 
     
    13861400CONFIG_LEDS_TRIGGERS=y 
    13871401# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set 
     1402# CONFIG_LEDS_TRIGGER_CPU is not set 
    13881403CONFIG_LEDS_TRIGGER_DEFAULT_ON=y 
    13891404# CONFIG_LEDS_TRIGGER_GPIO is not set 
     
    14561471# CONFIG_MD is not set 
    14571472# CONFIG_MDIO_BITBANG is not set 
     1473# CONFIG_MDIO_BUS_MUX_GPIO is not set 
     1474# CONFIG_MDIO_BUS_MUX_MMIOREG is not set 
    14581475# CONFIG_MD_FAULTY is not set 
    14591476# CONFIG_MEDIA_ANALOG_TV_SUPPORT is not set 
     
    14831500# CONFIG_MFD_DA9052_I2C is not set 
    14841501# CONFIG_MFD_DA9052_SPI is not set 
     1502# CONFIG_MFD_DA9055 is not set 
    14851503# CONFIG_MFD_JANZ_CMODIO is not set 
    14861504# CONFIG_MFD_LM3533 is not set 
     1505# CONFIG_MFD_LP8788 is not set 
    14871506# CONFIG_MFD_MAX77686 is not set 
    14881507# CONFIG_MFD_MAX77693 is not set 
     1508# CONFIG_MFD_MAX8907 is not set 
    14891509# CONFIG_MFD_MAX8925 is not set 
    14901510# CONFIG_MFD_MAX8997 is not set 
     
    15011521# CONFIG_MFD_SEC_CORE is not set 
    15021522# CONFIG_MFD_SM501 is not set 
     1523# CONFIG_MFD_SMSC is not set 
    15031524# CONFIG_MFD_STMPE is not set 
    15041525CONFIG_MFD_SUPPORT=y 
     1526# CONFIG_MFD_SYSCON is not set 
    15051527# CONFIG_MFD_T7L66XB is not set 
    15061528# CONFIG_MFD_TC3589X is not set 
     
    15751597# CONFIG_MODULE_FORCE_LOAD is not set 
    15761598# CONFIG_MODULE_FORCE_UNLOAD is not set 
     1599# CONFIG_MODULE_SIG is not set 
    15771600# CONFIG_MODULE_SRCVERSION_ALL is not set 
    15781601CONFIG_MODULE_UNLOAD=y 
     
    17951818# CONFIG_NETFILTER_XT_TARGET_LOG is not set 
    17961819# CONFIG_NETFILTER_XT_TARGET_MARK is not set 
     1820# CONFIG_NETFILTER_XT_TARGET_NETMAP is not set 
    17971821# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set 
    17981822# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set 
    17991823# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set 
    18001824# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set 
     1825# CONFIG_NETFILTER_XT_TARGET_REDIRECT is not set 
    18011826# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set 
    18021827# CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set 
     
    19291954CONFIG_NET_VENDOR_SEEQ=y 
    19301955CONFIG_NET_VENDOR_SILAN=y 
     1956CONFIG_NET_VENDOR_SILICOM=y 
    19311957CONFIG_NET_VENDOR_SIS=y 
    19321958CONFIG_NET_VENDOR_SMSC=y 
     
    19922018# CONFIG_NF_NAT_H323 is not set 
    19932019# CONFIG_NF_NAT_IRC is not set 
     2020CONFIG_NF_NAT_IPV4=m 
    19942021# CONFIG_NF_NAT_NEEDED is not set 
    19952022# CONFIG_NF_NAT_PPTP is not set 
     
    20912118# CONFIG_OC_ETM is not set 
    20922119# CONFIG_OF_SELFTEST is not set 
     2120# CONFIG_OMAP_OCP2SCP is not set 
     2121# CONFIG_OMAP_USB2 is not set 
    20932122# CONFIG_OMFS_FS is not set 
    20942123# CONFIG_OPENVSWITCH is not set 
     
    20982127# CONFIG_P54_COMMON is not set 
    20992128CONFIG_PACKET=y 
     2129# CONFIG_PACKET_DIAG is not set 
    21002130# CONFIG_PAGE_POISONING is not set 
    21012131# CONFIG_PAGE_SIZE_16KB is not set 
     
    22712301# CONFIG_PRISM54 is not set 
    22722302# CONFIG_PROBE_INITRD_HEADER is not set 
     2303# CONFIG_PROC_DEVICETREE is not set 
    22732304CONFIG_PROC_FS=y 
    22742305# CONFIG_PROC_KCORE is not set 
     
    23142345# CONFIG_RAR_REGISTER is not set 
    23152346# CONFIG_RAW_DRIVER is not set 
     2347# CONFIG_RBTREE_TEST is not set 
    23162348# CONFIG_RCU_CPU_STALL_INFO is not set 
    23172349CONFIG_RCU_CPU_STALL_TIMEOUT=60 
     
    23662398# CONFIG_RTC_DRV_DS1672 is not set 
    23672399# CONFIG_RTC_DRV_DS1742 is not set 
     2400# CONFIG_RTC_DRV_DS2404 is not set 
    23682401# CONFIG_RTC_DRV_DS3232 is not set 
    23692402# CONFIG_RTC_DRV_DS3234 is not set 
     
    24002433# CONFIG_RTC_DRV_RX8581 is not set 
    24012434# CONFIG_RTC_DRV_S35390A is not set 
     2435# CONFIG_RTC_DRV_SNVS is not set 
    24022436# CONFIG_RTC_DRV_STK17TA8 is not set 
    24032437# CONFIG_RTC_DRV_TEST is not set 
     
    24372471# CONFIG_SATA_DWC is not set 
    24382472# CONFIG_SATA_FSL is not set 
     2473# CONFIG_SATA_HIGHBANK is not set 
    24392474# CONFIG_SATA_INIC162X is not set 
    24402475# CONFIG_SATA_MV is not set 
     
    24532488# CONFIG_SBC_FITPC2_WATCHDOG is not set 
    24542489# CONFIG_SBE_2T3E3 is not set 
     2490# CONFIG_SBYPASS is not set 
    24552491# CONFIG_SC92031 is not set 
    24562492# CONFIG_SCC is not set 
     
    25662602# CONFIG_SENSORS_ADS7828 is not set 
    25672603# CONFIG_SENSORS_ADS7871 is not set 
     2604# CONFIG_SENSORS_ADT7410 is not set 
    25682605# CONFIG_SENSORS_ADT7411 is not set 
    25692606# CONFIG_SENSORS_ADT7462 is not set 
     
    26312668# CONFIG_SENSORS_MAX1619 is not set 
    26322669# CONFIG_SENSORS_MAX1668 is not set 
     2670# CONFIG_SENSORS_MAX197 is not set 
    26332671# CONFIG_SENSORS_MAX6639 is not set 
    26342672# CONFIG_SENSORS_MAX6642 is not set 
     
    26952733# CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set 
    26962734# CONFIG_SERIAL_PCH_UART is not set 
     2735# CONFIG_SERIAL_SCCNXP is not set 
    26972736# CONFIG_SERIAL_TIMBERDALE is not set 
    26982737# CONFIG_SERIAL_UARTLITE is not set 
     
    29633002CONFIG_STANDALONE=y 
    29643003CONFIG_STDBINUTILS=y 
     3004# CONFIG_STE_MODEM_RPROC is not set 
    29653005# CONFIG_STE10XP is not set 
    29663006# CONFIG_STMMAC_ETH is not set 
     
    30943134# CONFIG_UFS_FS is not set 
    30953135# CONFIG_UHID is not set 
     3136CONFIG_UIDGID_STRICT_TYPE_CHECKS=y 
    30963137# CONFIG_UIO is not set 
    30973138# CONFIG_ULTRA is not set 
     
    31423183# CONFIG_USB_ET61X251 is not set 
    31433184CONFIG_USB_EZUSB=y 
     3185# CONFIG_USB_EZUSB_FX2 is not set 
    31443186# CONFIG_USB_FILE_STORAGE is not set 
    31453187# CONFIG_USB_FTDI_ELAN is not set 
     
    35143556# CONFIG_VXFS_FS is not set 
    35153557# CONFIG_VXGE is not set 
     3558# CONFIG_VXLAN is not set 
    35163559# CONFIG_W1 is not set 
    35173560# CONFIG_W1_CON is not set 
  • trunk/target/linux/generic/patches-3.7/061-arm_xz_decompressor_build_fix.patch

    r33915 r34247  
    11--- a/arch/arm/boot/compressed/decompress.c 
    22+++ b/arch/arm/boot/compressed/decompress.c 
    3 @@ -47,6 +47,7 @@ extern void error(char *); 
     3@@ -50,6 +50,7 @@ extern char * strstr(const char * s1, co 
    44 #ifdef CONFIG_KERNEL_XZ 
    55 #define memmove memmove 
  • trunk/target/linux/generic/patches-3.7/100-overlayfs.patch

    r33911 r34247  
    244244--- a/fs/ecryptfs/main.c 
    245245+++ b/fs/ecryptfs/main.c 
    246 @@ -566,6 +566,13 @@ static struct dentry *ecryptfs_mount(str 
     246@@ -567,6 +567,13 @@ static struct dentry *ecryptfs_mount(str 
    247247        s->s_maxbytes = path.dentry->d_sb->s_maxbytes; 
    248248        s->s_blocksize = path.dentry->d_sb->s_blocksize; 
     
    284284--- a/fs/Makefile 
    285285+++ b/fs/Makefile 
    286 @@ -106,6 +106,7 @@ obj-$(CONFIG_QNX6FS_FS)             += qnx6/ 
     286@@ -107,6 +107,7 @@ obj-$(CONFIG_QNX6FS_FS)             += qnx6/ 
    287287 obj-$(CONFIG_AUTOFS4_FS)       += autofs4/ 
    288288 obj-$(CONFIG_ADFS_FS)          += adfs/ 
     
    294294--- a/fs/namei.c 
    295295+++ b/fs/namei.c 
    296 @@ -348,6 +348,7 @@ int __inode_permission(struct inode *ino 
     296@@ -402,6 +402,7 @@ int __inode_permission(struct inode *ino 
    297297  
    298298        return security_inode_permission(inode, mask); 
     
    302302 /** 
    303303  * sb_permission - Check superblock-level permissions 
    304 @@ -2822,9 +2823,12 @@ finish_open_created: 
     304@@ -2883,9 +2884,12 @@ finish_open_created: 
    305305        error = may_open(&nd->path, acc_mode, open_flag); 
    306306        if (error) 
     
    347347--- a/fs/open.c 
    348348+++ b/fs/open.c 
    349 @@ -787,8 +787,7 @@ struct file *dentry_open(const struct pa 
     349@@ -781,8 +781,7 @@ struct file *dentry_open(const struct pa 
    350350                return ERR_PTR(error); 
    351351  
     
    357357                error = open_check_o_direct(f); 
    358358                if (error) { 
    359 @@ -803,6 +802,26 @@ struct file *dentry_open(const struct pa 
     359@@ -797,6 +796,26 @@ struct file *dentry_open(const struct pa 
    360360 } 
    361361 EXPORT_SYMBOL(dentry_open); 
     
    381381+EXPORT_SYMBOL(vfs_open); 
    382382+ 
    383  static void __put_unused_fd(struct files_struct *files, unsigned int fd) 
     383 static inline int build_open_flags(int flags, umode_t mode, struct open_flags *op) 
    384384 { 
    385         struct fdtable *fdt = files_fdtable(files); 
     385        int lookup_flags = 0; 
    386386--- /dev/null 
    387387+++ b/fs/overlayfs/copy_up.c 
     
    31133113--- a/include/linux/fs.h 
    31143114+++ b/include/linux/fs.h 
    3115 @@ -505,6 +505,12 @@ struct iattr { 
     3115@@ -243,6 +243,12 @@ struct iattr { 
    31163116  */ 
    31173117 #include <linux/quota.h> 
     
    31263126  * enum positive_aop_returns - aop return codes with specific semantics 
    31273127  * 
    3128 @@ -1578,6 +1584,11 @@ struct super_block { 
     3128@@ -1321,6 +1327,11 @@ struct super_block { 
    31293129  
    31303130        /* Being remounted read-only */ 
     
    31383138  
    31393139 /* superblock cache pruning functions */ 
    3140 @@ -1835,6 +1846,7 @@ struct inode_operations { 
     3140@@ -1578,6 +1589,7 @@ struct inode_operations { 
    31413141        int (*atomic_open)(struct inode *, struct dentry *, 
    31423142                           struct file *, unsigned open_flag, 
     
    31463146  
    31473147 struct seq_file; 
    3148 @@ -2199,6 +2211,7 @@ extern long do_sys_open(int dfd, const c 
     3148@@ -2009,6 +2021,7 @@ extern struct file *file_open_name(struc 
    31493149 extern struct file *filp_open(const char *, int, umode_t); 
    31503150 extern struct file *file_open_root(struct dentry *, struct vfsmount *, 
     
    31533153 extern struct file * dentry_open(const struct path *, int, const struct cred *); 
    31543154 extern int filp_close(struct file *, fl_owner_t id); 
    3155  extern char * getname(const char __user *); 
    3156 @@ -2402,6 +2415,7 @@ extern sector_t bmap(struct inode *, sec 
     3155  
     3156@@ -2215,6 +2228,7 @@ extern sector_t bmap(struct inode *, sec 
    31573157 #endif 
    31583158 extern int notify_change(struct dentry *, struct iattr *); 
     
    31763176--- a/MAINTAINERS 
    31773177+++ b/MAINTAINERS 
    3178 @@ -5105,6 +5105,13 @@ F:       drivers/scsi/osd/ 
     3178@@ -5450,6 +5450,13 @@ F:       drivers/scsi/osd/ 
    31793179 F:     include/scsi/osd_* 
    31803180 F:     fs/exofs/ 
  • trunk/target/linux/generic/patches-3.7/201-extra_optimization.patch

    r33911 r34247  
    11--- a/Makefile 
    22+++ b/Makefile 
    3 @@ -556,9 +556,9 @@ endif # $(dot-config) 
     3@@ -570,9 +570,9 @@ endif # $(dot-config) 
    44 all: vmlinux 
    55  
     
    1313  
    1414 include $(srctree)/arch/$(SRCARCH)/Makefile 
    15 @@ -627,6 +627,9 @@ endif 
     15@@ -645,6 +645,9 @@ endif 
    1616 NOSTDINC_FLAGS += -nostdinc -isystem $(shell $(CC) -print-file-name=include) 
    1717 CHECKFLAGS     += $(NOSTDINC_FLAGS) 
  • trunk/target/linux/generic/patches-3.7/202-reduce_module_size.patch

    r33911 r34247  
    11--- a/Makefile 
    22+++ b/Makefile 
    3 @@ -369,7 +369,7 @@ KBUILD_CFLAGS_KERNEL := 
     3@@ -379,7 +379,7 @@ KBUILD_CFLAGS_KERNEL := 
    44 KBUILD_AFLAGS   := -D__ASSEMBLY__ 
    55 KBUILD_AFLAGS_MODULE  := -DMODULE 
  • trunk/target/linux/generic/patches-3.7/210-darwin_scripts_include.patch

    r29986 r34247  
    3939--- a/scripts/kconfig/Makefile 
    4040+++ b/scripts/kconfig/Makefile 
    41 @@ -123,6 +123,9 @@ check-lxdialog  := $(srctree)/$(src)/lxd 
     41@@ -129,6 +129,9 @@ check-lxdialog  := $(srctree)/$(src)/lxd 
    4242 # we really need to do so. (Do not call gcc as part of make mrproper) 
    4343 HOST_EXTRACFLAGS += $(shell $(CONFIG_SHELL) $(check-lxdialog) -ccflags) \ 
  • trunk/target/linux/generic/patches-3.7/220-module_exports.patch

    r33911 r34247  
    5555                                                                        \ 
    5656        /* __*init sections */                                          \ 
    57 @@ -670,6 +691,9 @@ 
     57@@ -679,6 +700,9 @@ 
    5858        EXIT_TEXT                                                       \ 
    5959        EXIT_DATA                                                       \ 
  • trunk/target/linux/generic/patches-3.7/230-openwrt_lzma_options.patch

    r29986 r34247  
    4545--- a/lib/decompress.c 
    4646+++ b/lib/decompress.c 
    47 @@ -40,6 +40,7 @@ static const struct compress_format { 
     47@@ -43,6 +43,7 @@ static const struct compress_format comp 
    4848        { {037, 0236}, "gzip", gunzip }, 
    4949        { {0x42, 0x5a}, "bzip2", bunzip2 }, 
  • trunk/target/linux/generic/patches-3.7/250-netfilter_depends.patch

    r33911 r34247  
    99        help 
    1010          H.323 is a VoIP signalling protocol from ITU-T. As one of the most 
    11 @@ -693,7 +692,6 @@ config NETFILTER_XT_TARGET_SECMARK 
     11@@ -750,7 +749,6 @@ config NETFILTER_XT_TARGET_SECMARK 
    1212  
    1313 config NETFILTER_XT_TARGET_TCPMSS 
  • trunk/target/linux/generic/patches-3.7/300-mips_expose_boot_raw.patch

    r33911 r34247  
    99--- a/arch/mips/Kconfig 
    1010+++ b/arch/mips/Kconfig 
    11 @@ -894,9 +894,6 @@ config ARC 
     11@@ -912,9 +912,6 @@ config ARC 
    1212 config ARCH_MAY_HAVE_PC_FDC 
    1313        bool 
     
    1919        bool 
    2020  
    21 @@ -2367,6 +2364,18 @@ config USE_OF 
    22         help 
    23           Include support for flattened device tree machine descriptions. 
     21@@ -2387,6 +2384,18 @@ config USE_OF 
     22        select OF_EARLY_FLATTREE 
     23        select IRQ_DOMAIN 
    2424  
    2525+config BOOT_RAW 
  • trunk/target/linux/generic/patches-3.7/301-mips_image_cmdline_hack.patch

    r33911 r34247  
    11--- a/arch/mips/Kconfig 
    22+++ b/arch/mips/Kconfig 
    3 @@ -993,6 +993,10 @@ config SYNC_R4K 
     3@@ -1011,6 +1011,10 @@ config SYNC_R4K 
    44 config MIPS_MACHINE 
    55        def_bool n 
  • trunk/target/linux/generic/patches-3.7/304-mips_disable_fpu.patch

    r33911 r34247  
    99--- a/arch/mips/Kconfig 
    1010+++ b/arch/mips/Kconfig 
    11 @@ -978,6 +978,17 @@ config I8259 
     11@@ -996,6 +996,17 @@ config I8259 
    1212 config MIPS_BONITO64 
    1313        bool 
  • trunk/target/linux/generic/patches-3.7/306-mips_mem_functions_performance.patch

    r33897 r34247  
    4848--- a/arch/mips/lib/Makefile 
    4949+++ b/arch/mips/lib/Makefile 
    50 @@ -3,7 +3,7 @@ 
    51  # 
     50@@ -4,7 +4,7 @@ 
    5251  
    53  lib-y  += csum_partial.o delay.o memcpy.o memset.o \ 
    54 -          strlen_user.o strncpy_user.o strnlen_user.o uncached.o 
    55 +          strlen_user.o strncpy_user.o strnlen_user.o uncached.o memcmp.o 
     52 lib-y  += bitops.o csum_partial.o delay.o memcpy.o memset.o \ 
     53           mips-atomic.o strlen_user.o strncpy_user.o \ 
     54-          strnlen_user.o uncached.o 
     55+          strnlen_user.o uncached.o memcmp.o 
    5656  
    5757 obj-y                  += iomap.o 
  • trunk/target/linux/generic/patches-3.7/308-mips-show-correct-cpu-name-for-24KEc.patch

    r33911 r34247  
    11--- a/arch/mips/kernel/cpu-probe.c 
    22+++ b/arch/mips/kernel/cpu-probe.c 
    3 @@ -833,10 +833,13 @@ static inline void cpu_probe_mips(struct 
     3@@ -839,10 +839,13 @@ static inline void cpu_probe_mips(struct 
    44                __cpu_name[cpu] = "MIPS 20Kc"; 
    55                break; 
  • trunk/target/linux/generic/patches-3.7/309-mips_fuse_workaround.patch

    r32395 r34247  
    2121 MODULE_ALIAS_MISCDEV(FUSE_MINOR); 
    2222 MODULE_ALIAS("devname:fuse"); 
    23 @@ -655,6 +658,9 @@ static int fuse_copy_fill(struct fuse_co 
     23@@ -654,6 +657,9 @@ static int fuse_copy_fill(struct fuse_co 
    2424 static int fuse_copy_do(struct fuse_copy_state *cs, void **val, unsigned *size) 
    2525 { 
  • trunk/target/linux/generic/patches-3.7/330-mips-add-crash-and-kdump-support.patch

    r33911 r34247  
    4848--- a/arch/mips/kernel/Makefile 
    4949+++ b/arch/mips/kernel/Makefile 
    50 @@ -97,7 +97,8 @@ obj-$(CONFIG_I8253)           += i8253.o 
     50@@ -80,7 +80,8 @@ obj-$(CONFIG_I8253)           += i8253.o 
    5151  
    5252 obj-$(CONFIG_GPIO_TXX9)                += gpio_txx9.o 
  • trunk/target/linux/generic/patches-3.7/331-mips-kexec-enhanche-the-support.patch

    r33911 r34247  
    147147--- a/arch/mips/kernel/vmlinux.lds.S 
    148148+++ b/arch/mips/kernel/vmlinux.lds.S 
    149 @@ -51,6 +51,10 @@ SECTIONS 
     149@@ -58,6 +58,10 @@ SECTIONS 
    150150                *(.text.*) 
    151151                *(.fixup) 
  • trunk/target/linux/generic/patches-3.7/340-module_alloc_size_check.patch

    r33911 r34247  
    11--- a/kernel/module.c 
    22+++ b/kernel/module.c 
    3 @@ -2353,12 +2353,15 @@ static void dynamic_debug_remove(struct 
     3@@ -2378,12 +2378,15 @@ static void dynamic_debug_remove(struct 
    44  
    55 void * __weak module_alloc(unsigned long size) 
  • trunk/target/linux/generic/patches-3.7/400-rootfs_split.patch

    r34093 r34247  
    291291         * If the driver is something smart, like UBI, it may need to maintain 
    292292         * its own reference counting. The below functions are only for driver. 
    293 @@ -375,6 +379,7 @@ extern int mtd_device_parse_register(str 
     293@@ -368,6 +372,7 @@ extern int mtd_device_parse_register(str 
    294294                              int defnr_parts); 
    295295 #define mtd_device_register(master, parts, nr_parts)   \ 
     
    316316  
    317317 #define MTDPART_OFS_RETAIN     (-3) 
    318 --- a/include/mtd/mtd-abi.h 
    319 +++ b/include/mtd/mtd-abi.h 
     318--- a/include/uapi/mtd/mtd-abi.h 
     319+++ b/include/uapi/mtd/mtd-abi.h 
    320320@@ -202,6 +202,7 @@ struct otp_info { 
    321321  * without OOB, e.g., NOR flash. 
  • trunk/target/linux/generic/patches-3.7/430-mtd_myloader_partition_parser.patch

    r29986 r34247  
    11--- a/drivers/mtd/Kconfig 
    22+++ b/drivers/mtd/Kconfig 
    3 @@ -156,6 +156,22 @@ config MTD_BCM63XX_PARTS 
    4           This provides partions parsing for BCM63xx devices with CFE 
    5           bootloaders. 
     3@@ -163,6 +163,22 @@ config MTD_BCM47XX_PARTS 
     4          This provides partitions parser for devices based on BCM47xx 
     5          boards. 
    66  
    77+config MTD_MYLOADER_PARTS 
     
    2626--- a/drivers/mtd/Makefile 
    2727+++ b/drivers/mtd/Makefile 
    28 @@ -12,6 +12,7 @@ obj-$(CONFIG_MTD_CMDLINE_PARTS) += cmdli 
    29  obj-$(CONFIG_MTD_AFS_PARTS)    += afs.o 
     28@@ -13,6 +13,7 @@ obj-$(CONFIG_MTD_AFS_PARTS)   += afs.o 
    3029 obj-$(CONFIG_MTD_AR7_PARTS)    += ar7part.o 
    3130 obj-$(CONFIG_MTD_BCM63XX_PARTS)        += bcm63xxpart.o 
     31 obj-$(CONFIG_MTD_BCM47XX_PARTS)        += bcm47xxpart.o 
    3232+obj-$(CONFIG_MTD_MYLOADER_PARTS) += myloader.o 
    3333  
  • trunk/target/linux/generic/patches-3.7/450-mtd_plat_nand_chip_fixup.patch

    r33911 r34247  
    66--- a/include/linux/mtd/nand.h 
    77+++ b/include/linux/mtd/nand.h 
    8 @@ -622,6 +622,7 @@ struct platform_nand_chip { 
     8@@ -640,6 +640,7 @@ struct platform_nand_chip { 
    99        unsigned int options; 
    1010        unsigned int bbt_options; 
     
    1616--- a/drivers/mtd/nand/plat_nand.c 
    1717+++ b/drivers/mtd/nand/plat_nand.c 
    18 @@ -98,7 +98,18 @@ static int __devinit plat_nand_probe(str 
     18@@ -103,7 +103,18 @@ static int __devinit plat_nand_probe(str 
    1919        } 
    2020  
  • trunk/target/linux/generic/patches-3.7/460-cfi_cmdset_0002_no_erase_suspend.patch

    r33911 r34247  
    11--- a/drivers/mtd/chips/cfi_cmdset_0002.c 
    22+++ b/drivers/mtd/chips/cfi_cmdset_0002.c 
    3 @@ -700,7 +700,7 @@ static int get_chip(struct map_info *map 
     3@@ -762,7 +762,7 @@ static int get_chip(struct map_info *map 
    44                return 0; 
    55  
  • trunk/target/linux/generic/patches-3.7/470-mtd_m25p80_add_pm25lv_flash_support.patch

    r33911 r34247  
    1717  
    1818 #define INFO(_jedec_id, _ext_id, _sector_size, _n_sectors, _flags)     \ 
    19 @@ -659,6 +661,10 @@ static const struct spi_device_id m25p_i 
    20         { "mx25l25635e", INFO(0xc22019, 0, 64 * 1024, 512, 0) }, 
    21         { "mx25l25655e", INFO(0xc22619, 0, 64 * 1024, 512, 0) }, 
     19@@ -667,6 +669,10 @@ static const struct spi_device_id m25p_i 
     20        { "n25q128",  INFO(0x20ba18, 0, 64 * 1024, 256, 0) }, 
     21        { "n25q256a", INFO(0x20ba19, 0, 64 * 1024, 512, SECT_4K) }, 
    2222  
    2323+       /* PMC -- pm25x "blocks" are 32K, sectors are 4K */ 
     
    2828         * for the chips listed here (without boot sectors). 
    2929         */ 
    30 @@ -895,6 +901,9 @@ static int __devinit m25p_probe(struct s 
     30@@ -907,6 +913,9 @@ static int __devinit m25p_probe(struct s 
    3131        if (info->flags & SECT_4K) { 
    3232                flash->erase_opcode = OPCODE_BE_4K; 
  • trunk/target/linux/generic/patches-3.7/473-mtd_m25p80_add_w25q128.patch

    r33911 r34247  
    11--- a/drivers/mtd/devices/m25p80.c 
    22+++ b/drivers/mtd/devices/m25p80.c 
    3 @@ -739,6 +739,7 @@ static const struct spi_device_id m25p_i 
     3@@ -751,6 +751,7 @@ static const struct spi_device_id m25p_i 
    44        { "w25x64", INFO(0xef3017, 0, 64 * 1024, 128, SECT_4K) }, 
    55        { "w25q64", INFO(0xef4017, 0, 64 * 1024, 128, SECT_4K) }, 
  • trunk/target/linux/generic/patches-3.7/475-mtd_cfi_cmdset_0002-add-buffer-write-cmd-timeout.patch

    r33911 r34247  
    99--- a/drivers/mtd/chips/cfi_cmdset_0002.c 
    1010+++ b/drivers/mtd/chips/cfi_cmdset_0002.c 
    11 @@ -1413,6 +1413,7 @@ static int __xipram do_write_buffer(stru 
     11@@ -1480,6 +1480,7 @@ static int __xipram do_write_buffer(stru 
    1212  
    1313        /* Write Buffer Load */ 
  • trunk/target/linux/generic/patches-3.7/476-mtd-m25p80-allow-to-disable-small-sector-erase.patch

    r33911 r34247  
    3131  
    3232 struct m25p { 
    33 @@ -899,7 +905,7 @@ static int __devinit m25p_probe(struct s 
     33@@ -911,7 +917,7 @@ static int __devinit m25p_probe(struct s 
    3434                flash->mtd._write = m25p80_write; 
    3535  
  • trunk/target/linux/generic/patches-3.7/500-yaffs-Kbuild-integration.patch

    r34019 r34247  
    1111--- a/fs/Makefile 
    1212+++ b/fs/Makefile 
    13 @@ -126,3 +126,5 @@ obj-$(CONFIG_GFS2_FS)           += gfs2/ 
     13@@ -127,3 +127,5 @@ obj-$(CONFIG_GFS2_FS)           += gfs2/ 
    1414 obj-y                          += exofs/ # Multiple modules 
    1515 obj-$(CONFIG_CEPH_FS)          += ceph/ 
  • trunk/target/linux/generic/patches-3.7/530-jffs2_make_lzma_available.patch

    r34053 r34247  
    252252        jffs2_inode_cachep = kmem_cache_create("jffs2_i", 
    253253                                             sizeof(struct jffs2_inode_info), 
    254 --- a/include/linux/jffs2.h 
    255 +++ b/include/linux/jffs2.h 
     254--- a/include/uapi/linux/jffs2.h 
     255+++ b/include/uapi/linux/jffs2.h 
    256256@@ -46,6 +46,7 @@ 
    257257 #define JFFS2_COMPR_DYNRUBIN   0x05 
  • trunk/target/linux/generic/patches-3.7/540-crypto-xz-decompression-support.patch

    r33911 r34247  
    11--- a/crypto/Kconfig 
    22+++ b/crypto/Kconfig 
    3 @@ -1008,6 +1008,13 @@ config CRYPTO_LZO 
     3@@ -1181,6 +1181,13 @@ config CRYPTO_842 
    44        help 
    5           This is the LZO algorithm. 
     5          This is the 842 algorithm. 
    66  
    77+config CRYPTO_XZ 
     
    2222 obj-$(CONFIG_CRYPTO_LZO) += lzo.o 
    2323+obj-$(CONFIG_CRYPTO_XZ) += xz.o 
     24 obj-$(CONFIG_CRYPTO_842) += 842.o 
    2425 obj-$(CONFIG_CRYPTO_RNG2) += rng.o 
    2526 obj-$(CONFIG_CRYPTO_RNG2) += krng.o 
    26  obj-$(CONFIG_CRYPTO_ANSI_CPRNG) += ansi_cprng.o 
    2727--- /dev/null 
    2828+++ b/crypto/xz.c 
  • trunk/target/linux/generic/patches-3.7/541-ubifs-xz-decompression-support.patch

    r33911 r34247  
    5252 struct ubifs_compressor *ubifs_compressors[UBIFS_COMPR_TYPES_CNT]; 
    5353  
    54 @@ -233,9 +251,15 @@ int __init ubifs_compressors_init(void) 
     54@@ -232,9 +250,15 @@ int __init ubifs_compressors_init(void) 
    5555        if (err) 
    5656                goto out_lzo; 
     
    6868        compr_exit(&lzo_compr); 
    6969        return err; 
    70 @@ -248,4 +272,5 @@ void ubifs_compressors_exit(void) 
     70@@ -247,4 +271,5 @@ void ubifs_compressors_exit(void) 
    7171 { 
    7272        compr_exit(&lzo_compr); 
  • trunk/target/linux/generic/patches-3.7/550-ubifs-symlink-xattr-support.patch

    r33911 r34247  
    11--- a/fs/ubifs/file.c 
    22+++ b/fs/ubifs/file.c 
    3 @@ -1573,6 +1573,12 @@ const struct inode_operations ubifs_syml 
     3@@ -1574,6 +1574,12 @@ const struct inode_operations ubifs_syml 
    44        .follow_link = ubifs_follow_link, 
    55        .setattr     = ubifs_setattr, 
  • trunk/target/linux/generic/patches-3.7/600-netfilter_layer7_2.22.patch

    r33911 r34247  
    11--- a/net/netfilter/Kconfig 
    22+++ b/net/netfilter/Kconfig 
    3 @@ -1119,6 +1119,27 @@ config NETFILTER_XT_MATCH_STATE 
     3@@ -1176,6 +1176,27 @@ config NETFILTER_XT_MATCH_STATE 
    44  
    55          To compile it as a module, choose M here.  If unsure, say N. 
     
    3131--- a/net/netfilter/Makefile 
    3232+++ b/net/netfilter/Makefile 
    33 @@ -112,6 +112,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_RECENT) 
     33@@ -131,6 +131,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_RECENT) 
    3434 obj-$(CONFIG_NETFILTER_XT_MATCH_SCTP) += xt_sctp.o 
    3535 obj-$(CONFIG_NETFILTER_XT_MATCH_SOCKET) += xt_socket.o 
     
    20602060--- a/net/netfilter/nf_conntrack_core.c 
    20612061+++ b/net/netfilter/nf_conntrack_core.c 
    2062 @@ -215,6 +215,14 @@ destroy_conntrack(struct nf_conntrack *n 
     2062@@ -221,6 +221,14 @@ destroy_conntrack(struct nf_conntrack *n 
    20632063         * too. */ 
    20642064        nf_ct_remove_expectations(ct); 
     
    21312131+ 
    21322132+#endif /* _XT_LAYER7_H */ 
    2133 --- a/include/linux/netfilter/Kbuild 
    2134 +++ b/include/linux/netfilter/Kbuild 
    2135 @@ -52,6 +52,7 @@ header-y += xt_hashlimit.h 
     2133--- a/include/uapi/linux/netfilter/Kbuild 
     2134+++ b/include/uapi/linux/netfilter/Kbuild 
     2135@@ -51,6 +51,7 @@ header-y += xt_hashlimit.h 
    21362136 header-y += xt_helper.h 
    21372137 header-y += xt_iprange.h 
  • trunk/target/linux/generic/patches-3.7/603-netfilter_layer7_2.6.36_fix.patch

    r33911 r34247  
    11--- a/net/netfilter/Kconfig 
    22+++ b/net/netfilter/Kconfig 
    3 @@ -923,6 +923,27 @@ config NETFILTER_XT_MATCH_IPVS 
     3@@ -980,6 +980,27 @@ config NETFILTER_XT_MATCH_IPVS 
    44  
    55          If unsure, say N. 
     
    2929        tristate '"length" match support' 
    3030        depends on NETFILTER_ADVANCED 
    31 @@ -1119,26 +1140,11 @@ config NETFILTER_XT_MATCH_STATE 
     31@@ -1176,26 +1197,11 @@ config NETFILTER_XT_MATCH_STATE 
    3232  
    3333          To compile it as a module, choose M here.  If unsure, say N. 
  • trunk/target/linux/generic/patches-3.7/604-netfilter_cisco_794x_iphone.patch

    r33911 r34247  
    1717  
    1818 enum sip_expectation_classes { 
    19 --- a/net/ipv4/netfilter/nf_nat_sip.c 
    20 +++ b/net/ipv4/netfilter/nf_nat_sip.c 
    21 @@ -73,11 +73,14 @@ static int map_addr(struct sk_buff *skb, 
     19--- a/net/netfilter/nf_nat_sip.c 
     20+++ b/net/netfilter/nf_nat_sip.c 
     21@@ -95,11 +95,14 @@ static int map_addr(struct sk_buff *skb, 
    2222        enum ip_conntrack_info ctinfo; 
    2323        struct nf_conn *ct = nf_ct_get(skb, &ctinfo); 
    2424        enum ip_conntrack_dir dir = CTINFO2DIR(ctinfo); 
    2525+       struct nf_ct_sip_master *ct_sip_info; 
    26         char buffer[sizeof("nnn.nnn.nnn.nnn:nnnnn")]; 
     26        char buffer[INET6_ADDRSTRLEN + sizeof("[]:nnnnn")]; 
    2727        unsigned int buflen; 
    28         __be32 newaddr; 
     28        union nf_inet_addr newaddr; 
    2929        __be16 newport; 
    3030  
    3131+       ct_sip_info = nfct_help_data(ct->master); 
    3232+ 
    33         if (ct->tuplehash[dir].tuple.src.u3.ip == addr->ip && 
     33        if (nf_inet_addr_cmp(&ct->tuplehash[dir].tuple.src.u3, addr) && 
    3434            ct->tuplehash[dir].tuple.src.u.udp.port == port) { 
    35                 newaddr = ct->tuplehash[!dir].tuple.dst.u3.ip; 
    36 @@ -85,7 +88,8 @@ static int map_addr(struct sk_buff *skb, 
    37         } else if (ct->tuplehash[dir].tuple.dst.u3.ip == addr->ip && 
     35                newaddr = ct->tuplehash[!dir].tuple.dst.u3; 
     36@@ -107,7 +110,8 @@ static int map_addr(struct sk_buff *skb, 
     37        } else if (nf_inet_addr_cmp(&ct->tuplehash[dir].tuple.dst.u3, addr) && 
    3838                   ct->tuplehash[dir].tuple.dst.u.udp.port == port) { 
    39                 newaddr = ct->tuplehash[!dir].tuple.src.u3.ip; 
     39                newaddr = ct->tuplehash[!dir].tuple.src.u3; 
    4040-               newport = ct->tuplehash[!dir].tuple.src.u.udp.port; 
    4141+               newport = ct_sip_info->forced_dport ? : 
     
    4444                return 1; 
    4545  
    46 @@ -121,6 +125,7 @@ static unsigned int ip_nat_sip(struct sk 
     46@@ -144,6 +148,7 @@ static unsigned int nf_nat_sip(struct sk 
    4747        enum ip_conntrack_info ctinfo; 
    4848        struct nf_conn *ct = nf_ct_get(skb, &ctinfo); 
     
    5252        enum sip_header_types hdr; 
    5353        union nf_inet_addr addr; 
    54 @@ -230,6 +235,22 @@ next: 
    55             !map_sip_addr(skb, dataoff, dptr, datalen, SIP_HDR_TO)) 
     54@@ -258,6 +263,22 @@ next: 
     55            !map_sip_addr(skb, protoff, dataoff, dptr, datalen, SIP_HDR_TO)) 
    5656                return NF_DROP; 
    5757  
     
    7575 } 
    7676  
    77 @@ -281,10 +302,13 @@ static unsigned int ip_nat_sip_expect(st 
     77@@ -311,10 +332,13 @@ static unsigned int nf_nat_sip_expect(st 
    7878        enum ip_conntrack_info ctinfo; 
    7979        struct nf_conn *ct = nf_ct_get(skb, &ctinfo); 
    8080        enum ip_conntrack_dir dir = CTINFO2DIR(ctinfo); 
    8181+       struct nf_conn_help *help = nfct_help(ct); 
    82         __be32 newip; 
     82        union nf_inet_addr newaddr; 
    8383        u_int16_t port; 
    8484+       __be16 srcport; 
    85         char buffer[sizeof("nnn.nnn.nnn.nnn:nnnnn")]; 
     85        char buffer[INET6_ADDRSTRLEN + sizeof("[]:nnnnn")]; 
    8686        unsigned int buflen; 
    8787+       struct nf_ct_sip_master *ct_sip_info = nfct_help_data(ct->master); 
    8888  
    8989        /* Connection will come from reply */ 
    90         if (ct->tuplehash[dir].tuple.src.u3.ip == ct->tuplehash[!dir].tuple.dst.u3.ip) 
    91 @@ -295,8 +319,9 @@ static unsigned int ip_nat_sip_expect(st 
     90        if (nf_inet_addr_cmp(&ct->tuplehash[dir].tuple.src.u3, 
     91@@ -326,8 +350,9 @@ static unsigned int nf_nat_sip_expect(st 
    9292        /* If the signalling port matches the connection's source port in the 
    9393         * original direction, try to use the destination port in the opposite 
     
    103103--- a/net/netfilter/nf_conntrack_sip.c 
    104104+++ b/net/netfilter/nf_conntrack_sip.c 
    105 @@ -1416,8 +1416,26 @@ static int process_sip_request(struct sk 
     105@@ -1440,8 +1440,26 @@ static int process_sip_request(struct sk 
    106106 { 
    107107        enum ip_conntrack_info ctinfo; 
  • trunk/target/linux/generic/patches-3.7/610-netfilter_match_bypass_default_checks.patch

    r33911 r34247  
    1 --- a/include/linux/netfilter_ipv4/ip_tables.h 
    2 +++ b/include/linux/netfilter_ipv4/ip_tables.h 
    3 @@ -93,6 +93,7 @@ struct ipt_ip { 
     1--- a/include/uapi/linux/netfilter_ipv4/ip_tables.h 
     2+++ b/include/uapi/linux/netfilter_ipv4/ip_tables.h 
     3@@ -87,6 +87,7 @@ struct ipt_ip { 
    44 #define IPT_F_FRAG             0x01    /* Set if rule is a fragment rule */ 
    55 #define IPT_F_GOTO             0x02    /* Set if jump is a goto */ 
  • trunk/target/linux/generic/patches-3.7/620-sched_esfq.patch

    r33911 r34247  
    1 --- a/include/linux/pkt_sched.h 
    2 +++ b/include/linux/pkt_sched.h 
     1--- a/include/uapi/linux/pkt_sched.h 
     2+++ b/include/uapi/linux/pkt_sched.h 
    33@@ -214,6 +214,33 @@ struct tc_sfq_xstats { 
    44        __s32           allot; 
  • trunk/target/linux/generic/patches-3.7/630-packet_socket_type.patch

    r33911 r34247  
    66Signed-off-by: Felix Fietkau <nbd@openwrt.org> 
    77 
    8 --- a/include/linux/if_packet.h 
    9 +++ b/include/linux/if_packet.h 
     8--- a/include/uapi/linux/if_packet.h 
     9+++ b/include/uapi/linux/if_packet.h 
    1010@@ -29,6 +29,8 @@ struct sockaddr_ll { 
    1111 /* These ones are invisible by user level */ 
     
    2727--- a/net/packet/af_packet.c 
    2828+++ b/net/packet/af_packet.c 
    29 @@ -295,6 +295,7 @@ struct packet_sock { 
    30         unsigned int            tp_loss:1; 
    31         unsigned int            tp_tstamp; 
    32         struct packet_type      prot_hook ____cacheline_aligned_in_smp; 
    33 +       unsigned int            pkt_type; 
    34  }; 
    35   
    36  #define PACKET_FANOUT_MAX      256 
    37 @@ -1384,6 +1385,7 @@ static int packet_rcv_spkt(struct sk_buf 
     29@@ -1273,6 +1273,7 @@ static int packet_rcv_spkt(struct sk_buf 
    3830 { 
    3931        struct sock *sk; 
     
    4335        /* 
    4436         *      When we registered the protocol we saved the socket in the data 
    45 @@ -1391,6 +1393,7 @@ static int packet_rcv_spkt(struct sk_buf 
     37@@ -1280,6 +1281,7 @@ static int packet_rcv_spkt(struct sk_buf 
    4638         */ 
    4739  
     
    5143        /* 
    5244         *      Yank back the headers [hope the device set this 
    53 @@ -1403,7 +1406,7 @@ static int packet_rcv_spkt(struct sk_buf 
     45@@ -1292,7 +1294,7 @@ static int packet_rcv_spkt(struct sk_buf 
    5446         *      so that this procedure is noop. 
    5547         */ 
     
    6052  
    6153        if (!net_eq(dev_net(dev), sock_net(sk))) 
    62 @@ -1609,12 +1612,12 @@ static int packet_rcv(struct sk_buff *sk 
     54@@ -1498,12 +1500,12 @@ static int packet_rcv(struct sk_buff *sk 
    6355        int skb_len = skb->len; 
    6456        unsigned int snaplen, res; 
     
    7668                goto drop; 
    7769  
    78 @@ -1733,12 +1736,12 @@ static int tpacket_rcv(struct sk_buff *s 
     70@@ -1622,12 +1624,12 @@ static int tpacket_rcv(struct sk_buff *s 
    7971        struct timespec ts; 
    8072        struct skb_shared_hwtstamps *shhwtstamps = skb_hwtstamps(skb); 
     
    9284                goto drop; 
    9385  
    94 @@ -2619,6 +2622,7 @@ static int packet_create(struct net *net 
     86@@ -2511,6 +2513,7 @@ static int packet_create(struct net *net 
    9587        spin_lock_init(&po->bind_lock); 
    9688        mutex_init(&po->pg_vec_lock); 
     
    10092        if (sock->type == SOCK_PACKET) 
    10193                po->prot_hook.func = packet_rcv_spkt; 
    102 @@ -3216,6 +3220,16 @@ packet_setsockopt(struct socket *sock, i 
     94@@ -3111,6 +3114,16 @@ packet_setsockopt(struct socket *sock, i 
    10395  
    10496                return fanout_add(sk, val & 0xffff, val >> 16); 
     
    117109                return -ENOPROTOOPT; 
    118110        } 
    119 @@ -3270,6 +3284,13 @@ static int packet_getsockopt(struct sock 
     111@@ -3165,6 +3178,13 @@ static int packet_getsockopt(struct sock 
    120112        case PACKET_VNET_HDR: 
    121113                val = po->has_vnet_hdr; 
     
    131123                val = po->tp_version; 
    132124                break; 
     125--- a/net/packet/internal.h 
     126+++ b/net/packet/internal.h 
     127@@ -111,6 +111,7 @@ struct packet_sock { 
     128        unsigned int            tp_loss:1; 
     129        unsigned int            tp_tstamp; 
     130        struct packet_type      prot_hook ____cacheline_aligned_in_smp; 
     131+       unsigned int            pkt_type; 
     132 }; 
     133  
     134 static struct packet_sock *pkt_sk(struct sock *sk) 
  • trunk/target/linux/generic/patches-3.7/643-bridge_remove_ipv6_dependency.patch

    r33982 r34247  
    2626--- a/net/ipv6/Makefile 
    2727+++ b/net/ipv6/Makefile 
    28 @@ -40,3 +40,4 @@ obj-$(CONFIG_IPV6_TUNNEL) += ip6_tunnel. 
     28@@ -41,3 +41,4 @@ obj-$(CONFIG_IPV6_GRE) += ip6_gre.o 
    2929 obj-y += addrconf_core.o exthdrs_core.o 
    3030  
     
    3333--- a/net/ipv6/addrconf.c 
    3434+++ b/net/ipv6/addrconf.c 
    35 @@ -1099,7 +1099,7 @@ out: 
     35@@ -1092,7 +1092,7 @@ out: 
    3636        return ret; 
    3737 } 
    3838  
    39 -int ipv6_dev_get_saddr(struct net *net, struct net_device *dst_dev, 
    40 +static int __ipv6_dev_get_saddr(struct net *net, struct net_device *dst_dev, 
     39-int ipv6_dev_get_saddr(struct net *net, const struct net_device *dst_dev, 
     40+static int __ipv6_dev_get_saddr(struct net *net, const struct net_device *dst_dev, 
    4141                       const struct in6_addr *daddr, unsigned int prefs, 
    4242                       struct in6_addr *saddr) 
    4343 { 
    44 @@ -1224,7 +1224,6 @@ try_nextdev: 
     44@@ -1217,7 +1217,6 @@ try_nextdev: 
    4545        in6_ifa_put(hiscore->ifa); 
    4646        return 0; 
     
    5050 int ipv6_get_lladdr(struct net_device *dev, struct in6_addr *addr, 
    5151                    unsigned char banned_flags) 
    52 @@ -4811,6 +4810,9 @@ int __init addrconf_init(void) 
     52@@ -4787,6 +4786,9 @@ int __init addrconf_init(void) 
    5353  
    5454        ipv6_addr_label_rtnl_register(); 
     
    6060 errout: 
    6161        rtnl_af_unregister(&inet6_ops); 
    62 @@ -4829,6 +4831,9 @@ void addrconf_cleanup(void) 
     62@@ -4805,6 +4807,9 @@ void addrconf_cleanup(void) 
    6363        struct net_device *dev; 
    6464        int i; 
  • trunk/target/linux/generic/patches-3.7/651-wireless_mesh_header.patch

    r33911 r34247  
    11--- a/include/linux/netdevice.h 
    22+++ b/include/linux/netdevice.h 
    3 @@ -147,7 +147,7 @@ static inline bool dev_xmit_complete(int 
     3@@ -134,7 +134,7 @@ static inline bool dev_xmit_complete(int 
    44  */ 
    55  
  • trunk/target/linux/generic/patches-3.7/652-atm_header_changes.patch

    r29986 r34247  
    1 --- a/include/linux/atm.h 
    2 +++ b/include/linux/atm.h 
     1--- a/include/uapi/linux/atm.h 
     2+++ b/include/uapi/linux/atm.h 
    33@@ -139,6 +139,9 @@ struct atm_trafprm { 
    44        int             min_pcr;        /* minimum PCR in cells per second */ 
  • trunk/target/linux/generic/patches-3.7/653-disable_netlink_trim.patch

    r34227 r34247  
    11--- a/net/netlink/af_netlink.c 
    22+++ b/net/netlink/af_netlink.c 
    3 @@ -893,25 +893,7 @@ void netlink_detachskb(struct sock *sk, 
     3@@ -895,25 +895,7 @@ void netlink_detachskb(struct sock *sk, 
    44  
    55 static struct sk_buff *netlink_trim(struct sk_buff *skb, gfp_t allocation) 
  • trunk/target/linux/generic/patches-3.7/655-increase_skb_pad.patch

    r33982 r34247  
    11--- a/include/linux/skbuff.h 
    22+++ b/include/linux/skbuff.h 
    3 @@ -1623,7 +1623,7 @@ static inline int pskb_network_may_pull( 
     3@@ -1626,7 +1626,7 @@ static inline int pskb_network_may_pull( 
    44  * NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8) 
    55  */ 
  • trunk/target/linux/generic/patches-3.7/700-swconfig.patch

    r33911 r34247  
    1717 comment "MII PHY device drivers" 
    1818  
    19  config AMD_PHY 
     19 config AT803X_PHY 
    2020--- a/drivers/net/phy/Makefile 
    2121+++ b/drivers/net/phy/Makefile 
  • trunk/target/linux/generic/patches-3.7/710-phy-add-mdio_register_board_info.patch

    r33911 r34247  
    11--- a/drivers/net/phy/mdio_bus.c 
    22+++ b/drivers/net/phy/mdio_bus.c 
    3 @@ -40,6 +40,8 @@ 
     3@@ -41,6 +41,8 @@ 
    44 #include <asm/irq.h> 
    55 #include <asm/uaccess.h> 
     
    1010  * mdiobus_alloc_size - allocate a mii_bus structure 
    1111  * @size: extra amount of memory to allocate for private storage. 
    12 @@ -228,15 +230,33 @@ void mdiobus_free(struct mii_bus *bus) 
     12@@ -229,15 +231,33 @@ void mdiobus_free(struct mii_bus *bus) 
    1313 } 
    1414 EXPORT_SYMBOL(mdiobus_free); 
  • trunk/target/linux/generic/patches-3.7/720-phy_adm6996.patch

    r33911 r34247  
    11--- a/drivers/net/phy/Kconfig 
    22+++ b/drivers/net/phy/Kconfig 
    3 @@ -116,6 +116,13 @@ config MICREL_PHY 
     3@@ -121,6 +121,13 @@ config MICREL_PHY 
    44        ---help--- 
    55          Supports the KSZ9021, VSC8201, KS8001 PHYs. 
  • trunk/target/linux/generic/patches-3.7/721-phy_packets.patch

    r33982 r34247  
    11--- a/include/linux/netdevice.h 
    22+++ b/include/linux/netdevice.h 
    3 @@ -1102,6 +1102,11 @@ struct net_device { 
     3@@ -1074,6 +1074,11 @@ struct net_device { 
    44        const struct net_device_ops *netdev_ops; 
    55        const struct ethtool_ops *ethtool_ops; 
     
    1313        const struct header_ops *header_ops; 
    1414  
    15 @@ -1158,6 +1163,9 @@ struct net_device { 
     15@@ -1130,6 +1135,9 @@ struct net_device { 
    1616        void                    *ax25_ptr;      /* AX.25 specific data */ 
    1717        struct wireless_dev     *ieee80211_ptr; /* IEEE 802.11 specific data, 
     
    2323 /* 
    2424  * Cache lines mostly used on receive path (including eth_type_trans()) 
    25 --- a/include/linux/if.h 
    26 +++ b/include/linux/if.h 
     25--- a/include/uapi/linux/if.h 
     26+++ b/include/uapi/linux/if.h 
    2727@@ -83,6 +83,7 @@ 
    2828 #define IFF_SUPP_NOFCS 0x80000         /* device supports sending custom FCS */ 
     
    3535--- a/include/linux/skbuff.h 
    3636+++ b/include/linux/skbuff.h 
    37 @@ -1653,6 +1653,10 @@ static inline int pskb_trim(struct sk_bu 
     37@@ -1656,6 +1656,10 @@ static inline int pskb_trim(struct sk_bu 
    3838        return (len < skb->len) ? __pskb_trim(skb, len) : 0; 
    3939 } 
     
    4646  *     pskb_trim_unique - remove end from a paged unique (not cloned) buffer 
    4747  *     @skb: buffer to alter 
    48 @@ -1755,16 +1759,6 @@ static inline struct sk_buff *dev_alloc_ 
     48@@ -1758,16 +1762,6 @@ static inline struct sk_buff *dev_alloc_ 
    4949 } 
    5050  
     
    8080--- a/net/core/dev.c 
    8181+++ b/net/core/dev.c 
    82 @@ -2243,9 +2243,19 @@ int dev_hard_start_xmit(struct sk_buff * 
    83                         } 
    84                 } 
     82@@ -2263,9 +2263,19 @@ int dev_hard_start_xmit(struct sk_buff * 
     83                if (!list_empty(&ptype_all)) 
     84                        dev_queue_xmit_nit(skb, dev); 
    8585  
    8686-               skb_len = skb->len; 
     
    103103                        txq_trans_update(txq); 
    104104                return rc; 
    105 @@ -2265,9 +2275,19 @@ gso: 
    106                 if (dev->priv_flags & IFF_XMIT_DST_RELEASE) 
    107                         skb_dst_drop(nskb); 
     105@@ -2288,9 +2298,19 @@ gso: 
     106                if (!list_empty(&ptype_all)) 
     107                        dev_queue_xmit_nit(nskb, dev); 
    108108  
    109109-               skb_len = nskb->len; 
     
    136136 #include <net/protocol.h> 
    137137 #include <net/dst.h> 
    138 @@ -441,6 +442,22 @@ struct sk_buff *__netdev_alloc_skb(struc 
     138@@ -455,6 +456,22 @@ struct sk_buff *__netdev_alloc_skb(struc 
    139139 } 
    140140 EXPORT_SYMBOL(__netdev_alloc_skb); 
  • trunk/target/linux/generic/patches-3.7/722-phy_mvswitch.patch

    r33911 r34247  
    11--- a/drivers/net/phy/Kconfig 
    22+++ b/drivers/net/phy/Kconfig 
    3 @@ -123,6 +123,10 @@ config ADM6996_PHY 
     3@@ -128,6 +128,10 @@ config ADM6996_PHY 
    44          Currently supports the ADM6996FC and ADM6996M switches. 
    55          Support for FC is very limited. 
  • trunk/target/linux/generic/patches-3.7/723-phy_ip175c.patch

    r33911 r34247  
    11--- a/drivers/net/phy/Kconfig 
    22+++ b/drivers/net/phy/Kconfig 
    3 @@ -127,6 +127,10 @@ config MVSWITCH_PHY 
     3@@ -132,6 +132,10 @@ config MVSWITCH_PHY 
    44        tristate "Driver for Marvell 88E6060 switches" 
    55        select ETHERNET_PACKET_MANGLE 
  • trunk/target/linux/generic/patches-3.7/724-phy_ar8216.patch

    r33911 r34247  
    11--- a/drivers/net/phy/Kconfig 
    22+++ b/drivers/net/phy/Kconfig 
    3 @@ -131,6 +131,11 @@ config IP17XX_PHY 
     3@@ -136,6 +136,11 @@ config IP17XX_PHY 
    44        tristate "Driver for IC+ IP17xx switches" 
    55        select SWCONFIG 
  • trunk/target/linux/generic/patches-3.7/725-phy_rtl8306.patch

    r33911 r34247  
    11--- a/drivers/net/phy/Kconfig 
    22+++ b/drivers/net/phy/Kconfig 
    3 @@ -136,6 +136,10 @@ config AR8216_PHY 
     3@@ -141,6 +141,10 @@ config AR8216_PHY 
    44        select ETHERNET_PACKET_MANGLE 
    55        select SWCONFIG 
  • trunk/target/linux/generic/patches-3.7/726-phy_rtl8366.patch

    r33911 r34247  
    11--- a/drivers/net/phy/Kconfig 
    22+++ b/drivers/net/phy/Kconfig 
    3 @@ -197,6 +197,30 @@ config MDIO_BUS_MUX_GPIO 
    4           several child MDIO busses to a parent bus.  Child bus 
    5           selection is under the control of GPIO lines. 
     3@@ -215,6 +215,30 @@ config MDIO_BUS_MUX_MMIOREG 
     4  
     5          Currently, only 8-bit registers are supported. 
    66  
    77+config RTL8366_SMI 
  • trunk/target/linux/generic/patches-3.7/727-phy-rtl8367.patch

    r33911 r34247  
    11--- a/drivers/net/phy/Kconfig 
    22+++ b/drivers/net/phy/Kconfig 
    3 @@ -219,6 +219,10 @@ config RTL8366RB_PHY 
     3@@ -237,6 +237,10 @@ config RTL8366RB_PHY 
    44        tristate "Driver for the Realtek RTL8366RB switch" 
    55        select SWCONFIG 
  • trunk/target/linux/generic/patches-3.7/728-phy-micrel.patch

    r33911 r34247  
    11--- a/drivers/net/phy/Kconfig 
    22+++ b/drivers/net/phy/Kconfig 
    3 @@ -140,6 +140,11 @@ config RTL8306_PHY 
     3@@ -145,6 +145,11 @@ config RTL8306_PHY 
    44        tristate "Driver for Realtek RTL8306S switches" 
    55        select SWCONFIG 
  • trunk/target/linux/generic/patches-3.7/729-phy-rtl8367b.patch

    r33911 r34247  
    11--- a/drivers/net/phy/Kconfig 
    22+++ b/drivers/net/phy/Kconfig 
    3 @@ -228,6 +228,10 @@ config RTL8367_PHY 
     3@@ -246,6 +246,10 @@ config RTL8367_PHY 
    44        tristate "Driver for the Realtek RTL8367R/M switches" 
    55        select SWCONFIG 
  • trunk/target/linux/generic/patches-3.7/729-phy-tantos.patch

    r33911 r34247  
    11--- a/drivers/net/phy/Kconfig 
    22+++ b/drivers/net/phy/Kconfig 
    3 @@ -239,3 +239,8 @@ endif # PHYLIB 
     3@@ -257,3 +257,8 @@ endif # PHYLIB 
    44 config MICREL_KS8995MA 
    55        tristate "Micrel KS8995MA 5-ports 10/100 managed Ethernet switch" 
  • trunk/target/linux/generic/patches-3.7/750-hostap_txpower.patch

    r33911 r34247  
    7575--- a/drivers/net/wireless/hostap/hostap_info.c 
    7676+++ b/drivers/net/wireless/hostap/hostap_info.c 
    77 @@ -434,6 +434,11 @@ static void handle_info_queue_linkstatus 
     77@@ -435,6 +435,11 @@ static void handle_info_queue_linkstatus 
    7878        } 
    7979  
     
    8989--- a/drivers/net/wireless/hostap/hostap_ioctl.c 
    9090+++ b/drivers/net/wireless/hostap/hostap_ioctl.c 
    91 @@ -1478,23 +1478,20 @@ static int prism2_txpower_hfa386x_to_dBm 
     91@@ -1479,23 +1479,20 @@ static int prism2_txpower_hfa386x_to_dBm 
    9292                val = 255; 
    9393  
     
    117117        return (unsigned char) tmp; 
    118118 } 
    119 @@ -4057,3 +4054,35 @@ int hostap_ioctl(struct net_device *dev, 
     119@@ -4052,3 +4049,35 @@ int hostap_ioctl(struct net_device *dev, 
    120120  
    121121        return ret; 
  • trunk/target/linux/generic/patches-3.7/810-pci_disable_common_quirks.patch

    r33911 r34247  
    11--- a/drivers/pci/Kconfig 
    22+++ b/drivers/pci/Kconfig 
    3 @@ -64,6 +64,12 @@ config XEN_PCIDEV_FRONTEND 
     3@@ -63,6 +63,12 @@ config XEN_PCIDEV_FRONTEND 
    44           The PCI device frontend driver allows the kernel to import arbitrary 
    55           PCI devices from a PCI backend to support PCI driver domains. 
  • trunk/target/linux/generic/patches-3.7/820-usb_add_usb_find_device_by_name.patch

    r33911 r34247  
    7575--- a/include/linux/usb.h 
    7676+++ b/include/linux/usb.h 
    77 @@ -584,6 +584,7 @@ extern int usb_lock_device_for_reset(str 
    78  extern int usb_reset_device(struct usb_device *dev); 
    79  extern void usb_queue_reset_device(struct usb_interface *dev); 
     77@@ -672,6 +672,7 @@ static inline bool usb_device_supports_l 
     78        return udev->bos->ss_cap->bmAttributes & USB_LTM_SUPPORT; 
     79 } 
    8080  
    8181+extern struct usb_device *usb_find_device_by_name(const char *name); 
    8282  
    83  /* USB autosuspend and autoresume */ 
    84  #ifdef CONFIG_USB_SUSPEND 
     83 /*-------------------------------------------------------------------------*/ 
     84  
  • trunk/target/linux/generic/patches-3.7/830-ledtrig_morse.patch

    r33911 r34247  
    11--- a/drivers/leds/Kconfig 
    22+++ b/drivers/leds/Kconfig 
    3 @@ -537,4 +537,8 @@ config LEDS_TRIGGER_TRANSIENT 
     3@@ -559,4 +559,8 @@ config LEDS_TRIGGER_TRANSIENT 
    44          GPIO/PWM based hardware. 
    55          If unsure, say Y. 
     
    1212--- a/drivers/leds/Makefile 
    1313+++ b/drivers/leds/Makefile 
    14 @@ -63,3 +63,4 @@ obj-$(CONFIG_LEDS_TRIGGER_BACKLIGHT)  += 
    15  obj-$(CONFIG_LEDS_TRIGGER_GPIO)                += ledtrig-gpio.o 
     14@@ -65,3 +65,4 @@ obj-$(CONFIG_LEDS_TRIGGER_GPIO)               += ledt 
     15 obj-$(CONFIG_LEDS_TRIGGER_CPU)         += ledtrig-cpu.o 
    1616 obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON)  += ledtrig-default-on.o 
    1717 obj-$(CONFIG_LEDS_TRIGGER_TRANSIENT)   += ledtrig-transient.o 
  • trunk/target/linux/generic/patches-3.7/831-ledtrig_netdev.patch

    r33911 r34247  
    11--- a/drivers/leds/Kconfig 
    22+++ b/drivers/leds/Kconfig 
    3 @@ -541,4 +541,11 @@ config LEDS_TRIGGER_MORSE 
     3@@ -563,4 +563,11 @@ config LEDS_TRIGGER_MORSE 
    44        tristate "LED Morse Trigger" 
    55        depends on LEDS_TRIGGERS 
     
    1515--- a/drivers/leds/Makefile 
    1616+++ b/drivers/leds/Makefile 
    17 @@ -64,3 +64,4 @@ obj-$(CONFIG_LEDS_TRIGGER_GPIO)               += ledt 
     17@@ -66,3 +66,4 @@ obj-$(CONFIG_LEDS_TRIGGER_CPU)                += ledtr 
    1818 obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON)  += ledtrig-default-on.o 
    1919 obj-$(CONFIG_LEDS_TRIGGER_TRANSIENT)   += ledtrig-transient.o 
  • trunk/target/linux/generic/patches-3.7/832-ledtrig_usbdev.patch

    r33911 r34247  
    11--- a/drivers/leds/Kconfig 
    22+++ b/drivers/leds/Kconfig 
    3 @@ -548,4 +548,11 @@ config LEDS_TRIGGER_NETDEV 
     3@@ -570,4 +570,11 @@ config LEDS_TRIGGER_NETDEV 
    44          This allows LEDs to be controlled by network device activity. 
    55          If unsure, say Y. 
     
    1515--- a/drivers/leds/Makefile 
    1616+++ b/drivers/leds/Makefile 
    17 @@ -65,3 +65,4 @@ obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON) += 
     17@@ -67,3 +67,4 @@ obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON) += 
    1818 obj-$(CONFIG_LEDS_TRIGGER_TRANSIENT)   += ledtrig-transient.o 
    1919 obj-$(CONFIG_LEDS_TRIGGER_MORSE)       += ledtrig-morse.o 
  • trunk/target/linux/generic/patches-3.7/840-rtc7301.patch

    r33911 r34247  
    11--- a/drivers/rtc/Kconfig 
    22+++ b/drivers/rtc/Kconfig 
    3 @@ -716,6 +716,15 @@ config RTC_DRV_NUC900 
     3@@ -754,6 +754,15 @@ config RTC_DRV_NUC900 
    44          If you say yes here you get support for the RTC subsystem of the 
    55          NUC910/NUC920 used in embedded systems. 
     
    1919--- a/drivers/rtc/Makefile 
    2020+++ b/drivers/rtc/Makefile 
    21 @@ -89,6 +89,7 @@ obj-$(CONFIG_RTC_DRV_RP5C01)  += rtc-rp5c 
     21@@ -92,6 +92,7 @@ obj-$(CONFIG_RTC_DRV_RP5C01)  += rtc-rp5c 
    2222 obj-$(CONFIG_RTC_DRV_RS5C313)  += rtc-rs5c313.o 
    2323 obj-$(CONFIG_RTC_DRV_RS5C348)  += rtc-rs5c348.o 
  • trunk/target/linux/generic/patches-3.7/841-rtc_pt7c4338.patch

    r33911 r34247  
    11--- a/drivers/rtc/Kconfig 
    22+++ b/drivers/rtc/Kconfig 
    3 @@ -389,6 +389,15 @@ config RTC_DRV_RV3029C2 
     3@@ -419,6 +419,15 @@ config RTC_DRV_RV3029C2 
    44          This driver can also be built as a module. If so, the module 
    55          will be called rtc-rv3029c2. 
     
    1919--- a/drivers/rtc/Makefile 
    2020+++ b/drivers/rtc/Makefile 
    21 @@ -82,6 +82,7 @@ obj-$(CONFIG_RTC_DRV_PL030)   += rtc-pl030 
     21@@ -84,6 +84,7 @@ obj-$(CONFIG_RTC_DRV_PL030)   += rtc-pl030 
    2222 obj-$(CONFIG_RTC_DRV_PL031)    += rtc-pl031.o 
    2323 obj-$(CONFIG_RTC_DRV_PM8XXX)   += rtc-pm8xxx.o 
  • trunk/target/linux/generic/patches-3.7/850-glamo_headers.patch

    r34103 r34247  
    1 --- a/include/linux/fb.h 
    2 +++ b/include/linux/fb.h 
    3 @@ -127,6 +127,7 @@ 
     1--- a/include/uapi/linux/fb.h 
     2+++ b/include/uapi/linux/fb.h 
     3@@ -122,6 +122,7 @@ 
    44 #define FB_ACCEL_TRIDENT_BLADE3D 52    /* Trident Blade3D              */ 
    55 #define FB_ACCEL_TRIDENT_BLADEXP 53    /* Trident BladeXP              */ 
     
    99 #define FB_ACCEL_NEOMAGIC_NM2090 91    /* NeoMagic NM2090              */ 
    1010 #define FB_ACCEL_NEOMAGIC_NM2093 92    /* NeoMagic NM2093              */ 
    11 --- a/include/linux/Kbuild 
    12 +++ b/include/linux/Kbuild 
    13 @@ -145,6 +145,8 @@ header-y += generic_serial.h 
     11--- a/include/uapi/linux/Kbuild 
     12+++ b/include/uapi/linux/Kbuild 
     13@@ -130,6 +130,8 @@ header-y += gen_stats.h 
    1414 header-y += genetlink.h 
    1515 header-y += gfs2_ondisk.h 
  • trunk/target/linux/generic/patches-3.7/861-04_spi_gpio_implement_spi_delay.patch

    r29986 r34247  
    1212 #include <linux/gpio.h> 
    1313+#include <linux/delay.h> 
     14 #include <linux/of_device.h> 
     15 #include <linux/of_gpio.h> 
    1416  
    15  #include <linux/spi/spi.h> 
    16  #include <linux/spi/spi_bitbang.h> 
    17 @@ -70,6 +71,7 @@ struct spi_gpio { 
     17@@ -73,6 +74,7 @@ struct spi_gpio { 
    1818  *             #define SPI_MOSI_GPIO   120 
    1919  *             #define SPI_SCK_GPIO    121 
     
    2323  */ 
    2424  
    25 @@ -77,6 +79,7 @@ struct spi_gpio { 
     25@@ -80,6 +82,7 @@ struct spi_gpio { 
    2626 #define DRIVER_NAME    "spi_gpio" 
    2727  
     
    3131 /* all functions referencing these symbols must define pdata */ 
    3232 #define SPI_MISO_GPIO  ((pdata)->miso) 
    33 @@ -121,12 +124,20 @@ static inline int getmiso(const struct s 
     33@@ -130,12 +133,20 @@ static inline int getmiso(const struct s 
    3434 #undef pdata 
    3535  
  • trunk/target/linux/generic/patches-3.7/862-gpio_spi_driver.patch

    r33911 r34247  
    346346--- a/drivers/spi/Kconfig 
    347347+++ b/drivers/spi/Kconfig 
    348 @@ -169,6 +169,15 @@ config SPI_GPIO 
     348@@ -170,6 +170,15 @@ config SPI_GPIO 
    349349          GPIO operations, you should be able to leverage that for better 
    350350          speed with a custom version of this driver; see the source code. 
  • trunk/target/linux/generic/patches-3.7/863-gpiommc.patch

    r33911 r34247  
    831831--- a/MAINTAINERS 
    832832+++ b/MAINTAINERS 
    833 @@ -3188,6 +3188,11 @@ L:       linuxppc-dev@lists.ozlabs.org 
     833@@ -3401,6 +3401,11 @@ L:       linuxppc-dev@lists.ozlabs.org 
    834834 S:     Odd Fixes 
    835835 F:     drivers/tty/hvc/ 
  • trunk/target/linux/generic/patches-3.7/865-gpiopwm.patch

    r33911 r34247  
    11--- a/drivers/Kconfig 
    22+++ b/drivers/Kconfig 
    3 @@ -60,6 +60,8 @@ source "drivers/pinctrl/Kconfig" 
     3@@ -62,6 +62,8 @@ source "drivers/pinctrl/Kconfig" 
    44  
    55 source "drivers/gpio/Kconfig" 
     
    1212--- a/drivers/Makefile 
    1313+++ b/drivers/Makefile 
    14 @@ -10,6 +10,7 @@ obj-y                         += pinctrl/ 
     14@@ -13,6 +13,7 @@ obj-y                         += pinctrl/ 
    1515 obj-y                          += gpio/ 
    1616 obj-y                          += pwm/ 
  • trunk/target/linux/generic/patches-3.7/880-gateworks_system_controller.patch

    r33911 r34247  
    1919--- a/drivers/hwmon/Makefile 
    2020+++ b/drivers/hwmon/Makefile 
    21 @@ -129,6 +129,7 @@ obj-$(CONFIG_SENSORS_W83L785TS)     += w83l7 
     21@@ -130,6 +130,7 @@ obj-$(CONFIG_SENSORS_W83L785TS)     += w83l7 
    2222 obj-$(CONFIG_SENSORS_W83L786NG)        += w83l786ng.o 
    2323 obj-$(CONFIG_SENSORS_WM831X)   += wm831x-hwmon.o 
  • trunk/target/linux/generic/patches-3.7/920-unable_to_open_console.patch

    r34042 r34247  
    11--- a/init/main.c 
    22+++ b/init/main.c 
    3 @@ -871,7 +871,7 @@ static int __init kernel_init(void * unu 
     3@@ -877,7 +877,7 @@ static void __init kernel_init_freeable( 
    44  
    55        /* Open the /dev/console on the rootfs, this should never fail */ 
  • trunk/target/linux/generic/patches-3.7/921-use_preinit_as_init.patch

    r34042 r34247  
    11--- a/init/main.c 
    22+++ b/init/main.c 
    3 @@ -829,10 +829,7 @@ static noinline int init_post(void) 
     3@@ -834,10 +834,7 @@ static int __ref kernel_init(void *unuse 
    44                printk(KERN_WARNING "Failed to execute %s.  Attempting " 
    55                                        "defaults...\n", execute_command); 
    66        } 
    7 -       run_init_process("/sbin/init"); 
    8 -       run_init_process("/etc/init"); 
    9 -       run_init_process("/bin/init"); 
    10 -       run_init_process("/bin/sh"); 
    11 +       run_init_process("/etc/preinit"); 
     7-       if (!run_init_process("/sbin/init") || 
     8-           !run_init_process("/etc/init") || 
     9-           !run_init_process("/bin/init") || 
     10-           !run_init_process("/bin/sh")) 
     11+       if (!run_init_process("/etc/preinit")) 
     12                return 0; 
    1213  
    1314        panic("No init found.  Try passing init= option to kernel. " 
    14               "See Linux Documentation/init.txt for guidance."); 
  • trunk/target/linux/generic/patches-3.7/930-crashlog.patch

    r34213 r34247  
    2121--- a/init/Kconfig 
    2222+++ b/init/Kconfig 
    23 @@ -1105,6 +1105,10 @@ config RELAY 
     23@@ -1091,6 +1091,10 @@ config RELAY 
    2424  
    2525          If unsure, say N. 
     
    246246--- a/kernel/module.c 
    247247+++ b/kernel/module.c 
    248 @@ -101,6 +101,9 @@ static LIST_HEAD(modules); 
     248@@ -103,6 +103,9 @@ static LIST_HEAD(modules); 
    249249 #ifdef CONFIG_KGDB_KDB 
    250250 struct list_head *kdb_modules = &modules; /* kdb needs the list of modules */ 
     
    254254+#endif 
    255255  
    256   
    257  /* Block module loading/unloading? */ 
     256 #ifdef CONFIG_MODULE_SIG 
     257 #ifdef CONFIG_MODULE_SIG_FORCE 
    258258--- a/mm/memblock.c 
    259259+++ b/mm/memblock.c 
     
    266266 static struct memblock_region memblock_memory_init_regions[INIT_MEMBLOCK_REGIONS] __initdata_memblock; 
    267267 static struct memblock_region memblock_reserved_init_regions[INIT_MEMBLOCK_REGIONS] __initdata_memblock; 
    268 @@ -341,6 +342,8 @@ static void __init_memblock memblock_ins 
     268@@ -342,6 +343,8 @@ static void __init_memblock memblock_ins 
    269269        memblock_set_region_node(rgn, nid); 
    270270        type->cnt++; 
  • trunk/target/linux/generic/patches-3.7/940-ocf_kbuild_integration.patch

    r33911 r34247  
    11--- a/crypto/Kconfig 
    22+++ b/crypto/Kconfig 
    3 @@ -1052,3 +1052,6 @@ config CRYPTO_USER_API_SKCIPHER 
    4  source "drivers/crypto/Kconfig" 
     3@@ -1226,3 +1226,6 @@ source "drivers/crypto/Kconfig" 
     4 source crypto/asymmetric_keys/Kconfig 
    55  
    66 endif  # if CRYPTO 
     
    1010--- a/crypto/Makefile 
    1111+++ b/crypto/Makefile 
    12 @@ -92,6 +92,8 @@ obj-$(CONFIG_CRYPTO_USER_API) += af_alg. 
     12@@ -93,6 +93,8 @@ obj-$(CONFIG_CRYPTO_USER_API) += af_alg. 
    1313 obj-$(CONFIG_CRYPTO_USER_API_HASH) += algif_hash.o 
    1414 obj-$(CONFIG_CRYPTO_USER_API_SKCIPHER) += algif_skcipher.o 
  • trunk/target/linux/generic/patches-3.7/941-ocf_20120127.patch

    r33911 r34247  
    9191--- a/fs/fcntl.c 
    9292+++ b/fs/fcntl.c 
    93 @@ -143,6 +143,7 @@ SYSCALL_DEFINE1(dup, unsigned int, filde 
    94         } 
    95         return ret; 
     93@@ -146,6 +146,7 @@ pid_t f_getown(struct file *filp) 
     94        read_unlock(&filp->f_owner.lock); 
     95        return pid; 
    9696 } 
    9797+EXPORT_SYMBOL(sys_dup); 
    9898  
    99  #define SETFL_MASK (O_APPEND | O_NONBLOCK | O_NDELAY | O_DIRECT | O_NOATIME) 
    100   
     99 static int f_setown_ex(struct file *filp, unsigned long arg) 
     100 { 
    101101--- a/include/linux/miscdevice.h 
    102102+++ b/include/linux/miscdevice.h 
     
    109109 #define TEMP_MINOR             131     /* Temperature Sensor */ 
    110110 #define RTC_MINOR              135 
    111 --- a/include/linux/random.h 
    112 +++ b/include/linux/random.h 
     111--- a/include/uapi/linux/random.h 
     112+++ b/include/uapi/linux/random.h 
    113113@@ -34,6 +34,30 @@ 
    114114 /* Clear the entropy pool and associated counters.  (Superuser only.) */ 
     
    142142        int     entropy_count; 
    143143        int     buf_size; 
    144 @@ -53,6 +77,10 @@ extern void add_input_randomness(unsigne 
     144--- a/include/linux/random.h 
     145+++ b/include/linux/random.h 
     146@@ -14,6 +14,10 @@ extern void add_input_randomness(unsigne 
    145147                                 unsigned int value); 
    146148 extern void add_interrupt_randomness(int irq, int irq_flags); 
  • trunk/target/linux/generic/patches-3.7/950-vm_exports.patch

    r33911 r34247  
    11--- a/mm/shmem.c 
    22+++ b/mm/shmem.c 
    3 @@ -2902,6 +2902,16 @@ EXPORT_SYMBOL_GPL(shmem_truncate_range); 
     3@@ -2769,6 +2769,15 @@ EXPORT_SYMBOL_GPL(shmem_truncate_range); 
    44  
    55 /* common code */ 
     
    1111+       vma->vm_file = file; 
    1212+       vma->vm_ops = &shmem_vm_ops; 
    13 +       vma->vm_flags |= VM_CAN_NONLINEAR; 
    1413+} 
    1514+EXPORT_SYMBOL_GPL(shmem_set_file); 
     
    1817  * shmem_file_setup - get an unlinked file living in tmpfs 
    1918  * @name: name for dentry (to be seen in /proc/<pid>/maps 
    20 @@ -2979,11 +2989,8 @@ int shmem_zero_setup(struct vm_area_stru 
     19@@ -2845,11 +2854,8 @@ int shmem_zero_setup(struct vm_area_stru 
     20        file = shmem_file_setup("dev/zero", size, vma->vm_flags); 
    2121        if (IS_ERR(file)) 
    2222                return PTR_ERR(file); 
     23+       shmem_set_file(vma, file); 
    2324  
    2425-       if (vma->vm_file) 
     
    2627-       vma->vm_file = file; 
    2728-       vma->vm_ops = &shmem_vm_ops; 
    28 -       vma->vm_flags |= VM_CAN_NONLINEAR; 
    29 +       shmem_set_file(vma, file); 
    30 + 
    3129        return 0; 
    3230 } 
     
    3432--- a/fs/file.c 
    3533+++ b/fs/file.c 
    36 @@ -269,6 +269,7 @@ int expand_files(struct files_struct *fi 
    37         /* All good, so we try */ 
    38         return expand_fdtable(files, nr); 
     34@@ -270,6 +270,7 @@ static inline void __set_open_fd(int fd, 
     35 { 
     36        __set_bit(fd, fdt->open_fds); 
    3937 } 
    4038+EXPORT_SYMBOL_GPL(expand_files); 
    4139  
    42  static int count_open_files(struct fdtable *fdt) 
     40 static inline void __clear_open_fd(int fd, struct fdtable *fdt) 
    4341 { 
    4442--- a/kernel/exit.c 
    4543+++ b/kernel/exit.c 
    46 @@ -513,6 +513,7 @@ struct files_struct *get_files_struct(st 
     44@@ -461,6 +461,7 @@ void daemonize(const char *name, ...) 
    4745  
    48         return files; 
     46        reparent_to_kthreadd(); 
    4947 } 
    5048+EXPORT_SYMBOL_GPL(get_files_struct); 
    5149  
    52  void put_files_struct(struct files_struct *files) 
    53  { 
    54 @@ -534,6 +535,7 @@ void put_files_struct(struct files_struc 
    55                 rcu_read_unlock(); 
    56         } 
     50 EXPORT_SYMBOL(daemonize); 
     51  
     52@@ -603,6 +604,7 @@ static void exit_mm(struct task_struct * 
     53        mm_update_next_owner(mm); 
     54        mmput(mm); 
    5755 } 
    5856+EXPORT_SYMBOL_GPL(put_files_struct); 
    5957  
    60  void reset_files_struct(struct files_struct *files) 
    61  { 
     58 /* 
     59  * When we die, we re-parent all our children, and try to: 
    6260--- a/kernel/sched/core.c 
    6361+++ b/kernel/sched/core.c 
    64 @@ -4106,6 +4106,7 @@ int can_nice(const struct task_struct *p 
     62@@ -3565,6 +3565,7 @@ int can_nice(const struct task_struct *p 
    6563        return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) || 
    6664                capable(CAP_SYS_NICE)); 
     
    7270--- a/mm/memory.c 
    7371+++ b/mm/memory.c 
    74 @@ -1408,6 +1408,7 @@ void zap_page_range(struct vm_area_struc 
     72@@ -1415,6 +1415,7 @@ void zap_page_range(struct vm_area_struc 
    7573        mmu_notifier_invalidate_range_end(mm, start, end); 
    7674        tlb_finish_mmu(&tlb, start, end); 
     
    10098--- a/include/linux/shmem_fs.h 
    10199+++ b/include/linux/shmem_fs.h 
    102 @@ -46,6 +46,8 @@ extern int shmem_init(void); 
     100@@ -47,6 +47,8 @@ extern int shmem_init(void); 
    103101 extern int shmem_fill_super(struct super_block *sb, void *data, int silent); 
    104102 extern struct file *shmem_file_setup(const char *name, 
  • trunk/target/linux/generic/patches-3.7/980-arm_openwrt_machtypes.patch

    r34165 r34247  
    11--- a/arch/arm/tools/mach-types 
    22+++ b/arch/arm/tools/mach-types 
    3 @@ -1206,3 +1206,31 @@ baileys                  MACH_BAILEYS            BAILEYS                 4169 
     3@@ -1204,3 +1204,31 @@ baileys                  MACH_BAILEYS            BAILEYS                 4169 
    44 familybox              MACH_FAMILYBOX          FAMILYBOX               4170 
    55 ensemble_mx35          MACH_ENSEMBLE_MX35      ENSEMBLE_MX35           4171 
Note: See TracChangeset for help on using the changeset viewer.