kernel: remove imq support, refresh patches
SVN-Revision: 25641
This commit is contained in:
Felix Fietkau
parent
fca74c3a44
commit
9dad83362d
156 changed files with 404 additions and 11052 deletions
|
|
@ -107,12 +107,6 @@ $(eval $(call nf_add,IPT_FILTER,CONFIG_IP_NF_MATCH_STRING, $(P_V4)ipt_string))
|
|||
$(eval $(call nf_add,IPT_FILTER,CONFIG_NETFILTER_XT_MATCH_STRING, $(P_XT)xt_string))
|
||||
|
||||
|
||||
# imq
|
||||
|
||||
$(eval $(call nf_add,IPT_IMQ,CONFIG_IP_NF_TARGET_IMQ, $(P_V4)ipt_IMQ))
|
||||
$(eval $(call nf_add,IPT_IMQ,CONFIG_NETFILTER_XT_TARGET_IMQ, $(P_XT)xt_IMQ))
|
||||
|
||||
|
||||
# ipopt
|
||||
|
||||
$(eval $(call nf_add,IPT_IPOPT,CONFIG_IP_NF_TARGET_DSCP, $(P_V4)ipt_DSCP))
|
||||
|
|
@ -200,7 +194,6 @@ $(eval $(call nf_add,IPT_IPV6,CONFIG_IP6_NF_MATCH_OWNER, $(P_V6)ip6t_owner))
|
|||
$(eval $(call nf_add,IPT_IPV6,CONFIG_IP6_NF_MATCH_OPTS, $(P_V6)ip6t_hbh))
|
||||
$(eval $(call nf_add,IPT_IPV6,CONFIG_IP6_NF_MATCH_RT, $(P_V6)ip6t_rt))
|
||||
|
||||
$(eval $(call nf_add,IPT_IPV6,CONFIG_IP6_NF_TARGET_IMQ, $(P_V6)ip6t_IMQ))
|
||||
$(eval $(call nf_add,IPT_IPV6,CONFIG_IP6_NF_TARGET_LOG, $(P_V6)ip6t_LOG))
|
||||
$(eval $(call nf_add,IPT_IPV6,CONFIG_IP6_NF_TARGET_REJECT, $(P_V6)ip6t_REJECT))
|
||||
$(eval $(call nf_add,IPT_IPV6,CONFIG_IP6_NF_TARGET_ROUTE, $(P_V6)ip6t_ROUTE))
|
||||
|
|
@ -331,7 +324,6 @@ IPT_BUILTIN += $(IPT_CONNTRACK-y)
|
|||
IPT_BUILTIN += $(IPT_CONNTRACK_EXTRA-y)
|
||||
IPT_BUILTIN += $(IPT_EXTRA-y)
|
||||
IPT_BUILTIN += $(IPT_FILTER-y)
|
||||
IPT_BUILTIN += $(IPT_IMQ-y)
|
||||
IPT_BUILTIN += $(IPT_IPOPT-y)
|
||||
IPT_BUILTIN += $(IPT_IPRANGE-y)
|
||||
IPT_BUILTIN += $(IPT_IPSEC-y)
|
||||
|
|
|
|||
|
|
@ -228,30 +228,6 @@ endef
|
|||
$(eval $(call KernelPackage,ipt-nathelper-extra))
|
||||
|
||||
|
||||
define KernelPackage/ipt-imq
|
||||
TITLE:=Intermediate Queueing support
|
||||
KCONFIG:= \
|
||||
CONFIG_IMQ \
|
||||
CONFIG_IMQ_BEHAVIOR_BA=y \
|
||||
CONFIG_IMQ_NUM_DEVS=2 \
|
||||
CONFIG_NETFILTER_XT_TARGET_IMQ
|
||||
FILES:= \
|
||||
$(LINUX_DIR)/drivers/net/imq.ko \
|
||||
$(foreach mod,$(IPT_IMQ-m),$(LINUX_DIR)/net/$(mod).ko)
|
||||
AUTOLOAD:=$(call AutoLoad,46,$(notdir \
|
||||
imq \
|
||||
$(IPT_IMQ-m) \
|
||||
))
|
||||
$(call AddDepends/ipt)
|
||||
endef
|
||||
|
||||
define KernelPackage/ipt-imq/description
|
||||
Kernel support for Intermediate Queueing devices
|
||||
endef
|
||||
|
||||
$(eval $(call KernelPackage,ipt-imq))
|
||||
|
||||
|
||||
define KernelPackage/ipt-queue
|
||||
TITLE:=Module for user-space packet queueing
|
||||
KCONFIG:=$(KCONFIG_IPT_QUEUE)
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ FEATURES:=squashfs jffs2 targz
|
|||
CFLAGS:=-Os -pipe -mips32r2 -mtune=mips32r2 -funit-at-a-time
|
||||
SUBTARGETS:=generic nand
|
||||
|
||||
LINUX_VERSION:=2.6.32.29
|
||||
LINUX_VERSION:=2.6.37.1
|
||||
|
||||
include $(INCLUDE_DIR)/target.mk
|
||||
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@
|
|||
depends on USB_OHCI_HCD && (STB03xxx || PPC_MPC52xx)
|
||||
--- a/drivers/usb/host/ehci-hcd.c
|
||||
+++ b/drivers/usb/host/ehci-hcd.c
|
||||
@@ -1197,6 +1197,11 @@ MODULE_LICENSE ("GPL");
|
||||
@@ -1210,6 +1210,11 @@ MODULE_LICENSE ("GPL");
|
||||
#define PLATFORM_DRIVER ehci_atmel_driver
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- a/drivers/net/Kconfig
|
||||
+++ b/drivers/net/Kconfig
|
||||
@@ -2168,6 +2168,8 @@ config ACENIC_OMIT_TIGON_I
|
||||
@@ -2045,6 +2045,8 @@ config ACENIC_OMIT_TIGON_I
|
||||
|
||||
The safe and default value for this is N.
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- a/drivers/mtd/devices/m25p80.c
|
||||
+++ b/drivers/mtd/devices/m25p80.c
|
||||
@@ -933,6 +933,16 @@ static int __devinit m25p_probe(struct s
|
||||
@@ -929,6 +929,16 @@ static int __devinit m25p_probe(struct s
|
||||
part_probes, &parts, 0);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- a/drivers/mtd/devices/m25p80.c
|
||||
+++ b/drivers/mtd/devices/m25p80.c
|
||||
@@ -943,6 +943,15 @@ static int __devinit m25p_probe(struct s
|
||||
@@ -939,6 +939,15 @@ static int __devinit m25p_probe(struct s
|
||||
}
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- a/drivers/mtd/chips/jedec_probe.c
|
||||
+++ b/drivers/mtd/chips/jedec_probe.c
|
||||
@@ -148,6 +148,7 @@
|
||||
@@ -149,6 +149,7 @@
|
||||
#define SST39LF160 0x2782
|
||||
#define SST39VF1601 0x234b
|
||||
#define SST39VF3201 0x235b
|
||||
|
|
@ -8,7 +8,7 @@
|
|||
#define SST39WF1601 0x274b
|
||||
#define SST39WF1602 0x274a
|
||||
#define SST39LF512 0x00D4
|
||||
@@ -1568,6 +1569,18 @@ static const struct amd_flash_info jedec
|
||||
@@ -1582,6 +1583,18 @@ static const struct amd_flash_info jedec
|
||||
ERASEINFO(0x10000,64),
|
||||
}
|
||||
}, {
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- a/drivers/mtd/chips/cfi_cmdset_0002.c
|
||||
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
|
||||
@@ -1218,8 +1218,8 @@ static int __xipram do_write_oneword(str
|
||||
@@ -1215,8 +1215,8 @@ static int __xipram do_write_oneword(str
|
||||
break;
|
||||
}
|
||||
|
||||
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
/* Latency issues. Drop the lock, wait a while and retry */
|
||||
UDELAY(map, chip, adr, 1);
|
||||
@@ -1235,6 +1235,8 @@ static int __xipram do_write_oneword(str
|
||||
@@ -1232,6 +1232,8 @@ static int __xipram do_write_oneword(str
|
||||
|
||||
ret = -EIO;
|
||||
}
|
||||
|
|
@ -20,7 +20,7 @@
|
|||
xip_enable(map, chip, adr);
|
||||
op_done:
|
||||
chip->state = FL_READY;
|
||||
@@ -1581,7 +1583,6 @@ static int cfi_amdstd_write_buffers(stru
|
||||
@@ -1578,7 +1580,6 @@ static int cfi_amdstd_write_buffers(stru
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -28,7 +28,7 @@
|
|||
/*
|
||||
* Handle devices with one erase region, that only implement
|
||||
* the chip erase command.
|
||||
@@ -1645,8 +1646,8 @@ static int __xipram do_erase_chip(struct
|
||||
@@ -1642,8 +1643,8 @@ static int __xipram do_erase_chip(struct
|
||||
chip->erase_suspended = 0;
|
||||
}
|
||||
|
||||
|
|
@ -39,7 +39,7 @@
|
|||
|
||||
if (time_after(jiffies, timeo)) {
|
||||
printk(KERN_WARNING "MTD %s(): software timeout\n",
|
||||
@@ -1666,6 +1667,7 @@ static int __xipram do_erase_chip(struct
|
||||
@@ -1663,6 +1664,7 @@ static int __xipram do_erase_chip(struct
|
||||
ret = -EIO;
|
||||
}
|
||||
|
||||
|
|
@ -47,7 +47,7 @@
|
|||
chip->state = FL_READY;
|
||||
xip_enable(map, chip, adr);
|
||||
put_chip(map, chip, adr);
|
||||
@@ -1733,9 +1735,9 @@ static int __xipram do_erase_oneblock(st
|
||||
@@ -1730,9 +1732,9 @@ static int __xipram do_erase_oneblock(st
|
||||
chip->erase_suspended = 0;
|
||||
}
|
||||
|
||||
|
|
@ -59,7 +59,7 @@
|
|||
}
|
||||
|
||||
if (time_after(jiffies, timeo)) {
|
||||
@@ -1757,6 +1759,7 @@ static int __xipram do_erase_oneblock(st
|
||||
@@ -1754,6 +1756,7 @@ static int __xipram do_erase_oneblock(st
|
||||
ret = -EIO;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- a/drivers/mtd/devices/m25p80.c
|
||||
+++ b/drivers/mtd/devices/m25p80.c
|
||||
@@ -952,6 +952,16 @@ static int __devinit m25p_probe(struct s
|
||||
@@ -948,6 +948,16 @@ static int __devinit m25p_probe(struct s
|
||||
part_probes, &parts, 0);
|
||||
}
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -12,9 +12,9 @@
|
|||
/* makes sure the async qh will become idle */
|
||||
--- a/drivers/usb/host/ehci.h
|
||||
+++ b/drivers/usb/host/ehci.h
|
||||
@@ -131,6 +131,7 @@ struct ehci_hcd { /* one per controlle
|
||||
unsigned need_io_watchdog:1;
|
||||
@@ -132,6 +132,7 @@ struct ehci_hcd { /* one per controlle
|
||||
unsigned broken_periodic:1;
|
||||
unsigned amd_l1_fix:1;
|
||||
unsigned fs_i_thresh:1; /* Intel iso scheduling */
|
||||
+ unsigned has_synopsys_hc_bug:1; /* Synopsys HC */
|
||||
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@
|
|||
|
||||
/* Atmel chips don't use the same PRI format as AMD chips */
|
||||
static void fixup_convert_atmel_pri(struct mtd_info *mtd, void *param)
|
||||
@@ -1392,6 +1396,7 @@ static int cfi_amdstd_write_words(struct
|
||||
@@ -1389,6 +1393,7 @@ static int cfi_amdstd_write_words(struct
|
||||
/*
|
||||
* FIXME: interleaved mode not tested, and probably not supported!
|
||||
*/
|
||||
|
|
@ -43,7 +43,7 @@
|
|||
static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip,
|
||||
unsigned long adr, const u_char *buf,
|
||||
int len)
|
||||
@@ -1503,7 +1508,6 @@ static int __xipram do_write_buffer(stru
|
||||
@@ -1500,7 +1505,6 @@ static int __xipram do_write_buffer(stru
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
|
@ -51,7 +51,7 @@
|
|||
static int cfi_amdstd_write_buffers(struct mtd_info *mtd, loff_t to, size_t len,
|
||||
size_t *retlen, const u_char *buf)
|
||||
{
|
||||
@@ -1582,6 +1586,7 @@ static int cfi_amdstd_write_buffers(stru
|
||||
@@ -1579,6 +1583,7 @@ static int cfi_amdstd_write_buffers(stru
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- a/drivers/mtd/nand/rb4xx_nand.c
|
||||
+++ b/drivers/mtd/nand/rb4xx_nand.c
|
||||
@@ -220,7 +220,7 @@ static int __init rb4xx_nand_probe(struc
|
||||
@@ -223,7 +223,7 @@ static int __init rb4xx_nand_probe(struc
|
||||
|
||||
platform_set_drvdata(pdev, info);
|
||||
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
cflags-$(CONFIG_CPU_DADDI_WORKAROUNDS) += $(call cc-option,-mno-daddi,)
|
||||
--- a/arch/mips/Kconfig
|
||||
+++ b/arch/mips/Kconfig
|
||||
@@ -63,6 +63,23 @@ config AR7
|
||||
@@ -65,6 +65,23 @@ config AR7
|
||||
Support for the Texas Instruments AR7 System-on-a-Chip
|
||||
family: TNETD7100, 7200 and 7300.
|
||||
|
||||
|
|
@ -40,7 +40,7 @@
|
|||
config BCM47XX
|
||||
bool "Broadcom BCM47XX based boards"
|
||||
select CEVT_R4K
|
||||
@@ -715,6 +732,7 @@ config CAVIUM_OCTEON_REFERENCE_BOARD
|
||||
@@ -717,6 +734,7 @@ config CAVIUM_OCTEON_REFERENCE_BOARD
|
||||
endchoice
|
||||
|
||||
source "arch/mips/alchemy/Kconfig"
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@
|
|||
depends on USB_OHCI_HCD && (STB03xxx || PPC_MPC52xx)
|
||||
--- a/drivers/usb/host/ehci-hcd.c
|
||||
+++ b/drivers/usb/host/ehci-hcd.c
|
||||
@@ -1216,6 +1216,11 @@ MODULE_LICENSE ("GPL");
|
||||
@@ -1229,6 +1229,11 @@ MODULE_LICENSE ("GPL");
|
||||
#define PLATFORM_DRIVER ehci_octeon_driver
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- a/drivers/net/Kconfig
|
||||
+++ b/drivers/net/Kconfig
|
||||
@@ -2191,6 +2191,8 @@ config ACENIC_OMIT_TIGON_I
|
||||
@@ -2068,6 +2068,8 @@ config ACENIC_OMIT_TIGON_I
|
||||
|
||||
The safe and default value for this is N.
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- a/drivers/watchdog/Kconfig
|
||||
+++ b/drivers/watchdog/Kconfig
|
||||
@@ -927,6 +927,13 @@ config BCM63XX_WDT
|
||||
@@ -930,6 +930,13 @@ config BCM63XX_WDT
|
||||
To compile this driver as a loadable module, choose M here.
|
||||
The module will be called bcm63xx_wdt.
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- a/drivers/mtd/devices/m25p80.c
|
||||
+++ b/drivers/mtd/devices/m25p80.c
|
||||
@@ -937,6 +937,16 @@ static int __devinit m25p_probe(struct s
|
||||
@@ -933,6 +933,16 @@ static int __devinit m25p_probe(struct s
|
||||
part_probes, &parts, 0);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- a/drivers/mtd/devices/m25p80.c
|
||||
+++ b/drivers/mtd/devices/m25p80.c
|
||||
@@ -947,6 +947,15 @@ static int __devinit m25p_probe(struct s
|
||||
@@ -943,6 +943,15 @@ static int __devinit m25p_probe(struct s
|
||||
}
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- a/drivers/mtd/chips/jedec_probe.c
|
||||
+++ b/drivers/mtd/chips/jedec_probe.c
|
||||
@@ -148,6 +148,7 @@
|
||||
@@ -149,6 +149,7 @@
|
||||
#define SST39LF160 0x2782
|
||||
#define SST39VF1601 0x234b
|
||||
#define SST39VF3201 0x235b
|
||||
|
|
@ -8,7 +8,7 @@
|
|||
#define SST39WF1601 0x274b
|
||||
#define SST39WF1602 0x274a
|
||||
#define SST39LF512 0x00D4
|
||||
@@ -1568,6 +1569,18 @@ static const struct amd_flash_info jedec
|
||||
@@ -1582,6 +1583,18 @@ static const struct amd_flash_info jedec
|
||||
ERASEINFO(0x10000,64),
|
||||
}
|
||||
}, {
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- a/drivers/mtd/chips/cfi_cmdset_0002.c
|
||||
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
|
||||
@@ -1231,8 +1231,8 @@ static int __xipram do_write_oneword(str
|
||||
@@ -1228,8 +1228,8 @@ static int __xipram do_write_oneword(str
|
||||
break;
|
||||
}
|
||||
|
||||
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
/* Latency issues. Drop the lock, wait a while and retry */
|
||||
UDELAY(map, chip, adr, 1);
|
||||
@@ -1248,6 +1248,8 @@ static int __xipram do_write_oneword(str
|
||||
@@ -1245,6 +1245,8 @@ static int __xipram do_write_oneword(str
|
||||
|
||||
ret = -EIO;
|
||||
}
|
||||
|
|
@ -20,7 +20,7 @@
|
|||
xip_enable(map, chip, adr);
|
||||
op_done:
|
||||
chip->state = FL_READY;
|
||||
@@ -1579,7 +1581,6 @@ static int cfi_amdstd_write_buffers(stru
|
||||
@@ -1576,7 +1578,6 @@ static int cfi_amdstd_write_buffers(stru
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -28,7 +28,7 @@
|
|||
/*
|
||||
* Handle devices with one erase region, that only implement
|
||||
* the chip erase command.
|
||||
@@ -1643,8 +1644,8 @@ static int __xipram do_erase_chip(struct
|
||||
@@ -1640,8 +1641,8 @@ static int __xipram do_erase_chip(struct
|
||||
chip->erase_suspended = 0;
|
||||
}
|
||||
|
||||
|
|
@ -39,7 +39,7 @@
|
|||
|
||||
if (time_after(jiffies, timeo)) {
|
||||
printk(KERN_WARNING "MTD %s(): software timeout\n",
|
||||
@@ -1664,6 +1665,7 @@ static int __xipram do_erase_chip(struct
|
||||
@@ -1661,6 +1662,7 @@ static int __xipram do_erase_chip(struct
|
||||
ret = -EIO;
|
||||
}
|
||||
|
||||
|
|
@ -47,7 +47,7 @@
|
|||
chip->state = FL_READY;
|
||||
xip_enable(map, chip, adr);
|
||||
put_chip(map, chip, adr);
|
||||
@@ -1731,9 +1733,9 @@ static int __xipram do_erase_oneblock(st
|
||||
@@ -1728,9 +1730,9 @@ static int __xipram do_erase_oneblock(st
|
||||
chip->erase_suspended = 0;
|
||||
}
|
||||
|
||||
|
|
@ -59,7 +59,7 @@
|
|||
}
|
||||
|
||||
if (time_after(jiffies, timeo)) {
|
||||
@@ -1755,6 +1757,7 @@ static int __xipram do_erase_oneblock(st
|
||||
@@ -1752,6 +1754,7 @@ static int __xipram do_erase_oneblock(st
|
||||
ret = -EIO;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- a/drivers/mtd/devices/m25p80.c
|
||||
+++ b/drivers/mtd/devices/m25p80.c
|
||||
@@ -956,6 +956,16 @@ static int __devinit m25p_probe(struct s
|
||||
@@ -952,6 +952,16 @@ static int __devinit m25p_probe(struct s
|
||||
part_probes, &parts, 0);
|
||||
}
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -12,8 +12,8 @@
|
|||
/* makes sure the async qh will become idle */
|
||||
--- a/drivers/usb/host/ehci.h
|
||||
+++ b/drivers/usb/host/ehci.h
|
||||
@@ -133,6 +133,7 @@ struct ehci_hcd { /* one per controlle
|
||||
unsigned broken_periodic:1;
|
||||
@@ -134,6 +134,7 @@ struct ehci_hcd { /* one per controlle
|
||||
unsigned amd_l1_fix:1;
|
||||
unsigned fs_i_thresh:1; /* Intel iso scheduling */
|
||||
unsigned use_dummy_qh:1; /* AMD Frame List table quirk*/
|
||||
+ unsigned has_synopsys_hc_bug:1; /* Synopsys HC */
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@
|
|||
|
||||
/* Atmel chips don't use the same PRI format as AMD chips */
|
||||
static void fixup_convert_atmel_pri(struct mtd_info *mtd, void *param)
|
||||
@@ -1391,6 +1395,7 @@ static int cfi_amdstd_write_words(struct
|
||||
@@ -1388,6 +1392,7 @@ static int cfi_amdstd_write_words(struct
|
||||
/*
|
||||
* FIXME: interleaved mode not tested, and probably not supported!
|
||||
*/
|
||||
|
|
@ -43,7 +43,7 @@
|
|||
static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip,
|
||||
unsigned long adr, const u_char *buf,
|
||||
int len)
|
||||
@@ -1501,7 +1506,6 @@ static int __xipram do_write_buffer(stru
|
||||
@@ -1498,7 +1503,6 @@ static int __xipram do_write_buffer(stru
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
|
@ -51,7 +51,7 @@
|
|||
static int cfi_amdstd_write_buffers(struct mtd_info *mtd, loff_t to, size_t len,
|
||||
size_t *retlen, const u_char *buf)
|
||||
{
|
||||
@@ -1580,6 +1584,7 @@ static int cfi_amdstd_write_buffers(stru
|
||||
@@ -1577,6 +1581,7 @@ static int cfi_amdstd_write_buffers(stru
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
--- a/drivers/leds/Kconfig
|
||||
+++ b/drivers/leds/Kconfig
|
||||
@@ -347,6 +347,13 @@ config LEDS_TRIGGERS
|
||||
|
||||
if LEDS_TRIGGERS
|
||||
@@ -377,6 +377,13 @@ config LEDS_TRIGGERS
|
||||
These triggers allow kernel events to drive the LEDs and can
|
||||
be configured via sysfs. If unsure, say Y.
|
||||
|
||||
+config LEDS_WNDR3700_USB
|
||||
+ tristate "NETGEAR WNDR3700 USB LED driver"
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- a/drivers/leds/Kconfig
|
||||
+++ b/drivers/leds/Kconfig
|
||||
@@ -354,6 +354,10 @@ config LEDS_WNDR3700_USB
|
||||
@@ -384,6 +384,10 @@ config LEDS_WNDR3700_USB
|
||||
This option enables support for the USB LED found on the
|
||||
NETGEAR WNDR3700 board.
|
||||
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
--- a/arch/mips/Kconfig
|
||||
+++ b/arch/mips/Kconfig
|
||||
@@ -907,6 +907,9 @@ config MIPS_NILE4
|
||||
@@ -909,6 +909,9 @@ config MIPS_NILE4
|
||||
config MIPS_DISABLE_OBSOLETE_IDE
|
||||
bool
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- a/drivers/mtd/nand/rb4xx_nand.c
|
||||
+++ b/drivers/mtd/nand/rb4xx_nand.c
|
||||
@@ -220,7 +220,7 @@ static int __init rb4xx_nand_probe(struc
|
||||
@@ -223,7 +223,7 @@ static int __init rb4xx_nand_probe(struc
|
||||
|
||||
platform_set_drvdata(pdev, info);
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
extern void check_wait(void);
|
||||
extern asmlinkage void r4k_wait(void);
|
||||
@@ -1552,6 +1553,8 @@ void __cpuinit per_cpu_trap_init(void)
|
||||
@@ -1578,6 +1579,8 @@ void __cpuinit per_cpu_trap_init(void)
|
||||
if (cpu_has_mips_r2) {
|
||||
cp0_compare_irq_shift = CAUSEB_TI - CAUSEB_IP;
|
||||
cp0_compare_irq = (read_c0_intctl() >> INTCTLB_IPTI) & 7;
|
||||
|
|
|
|||
|
|
@ -805,12 +805,6 @@ CONFIG_IDE_PROC_FS=y
|
|||
# CONFIG_IKCONFIG is not set
|
||||
# CONFIG_IKCONFIG_PROC is not set
|
||||
# CONFIG_IMAGE_CMDLINE_HACK is not set
|
||||
# CONFIG_IMQ is not set
|
||||
# CONFIG_IMQ_BEHAVIOR_AA is not set
|
||||
# CONFIG_IMQ_BEHAVIOR_AB is not set
|
||||
# CONFIG_IMQ_BEHAVIOR_BA is not set
|
||||
# CONFIG_IMQ_BEHAVIOR_BB is not set
|
||||
CONFIG_IMQ_NUM_DEVS=2
|
||||
CONFIG_INET=y
|
||||
# CONFIG_INET6_AH is not set
|
||||
# CONFIG_INET6_ESP is not set
|
||||
|
|
|
|||
|
|
@ -799,12 +799,6 @@ CONFIG_IDE_PROC_FS=y
|
|||
# CONFIG_IKCONFIG is not set
|
||||
# CONFIG_IKCONFIG_PROC is not set
|
||||
# CONFIG_IMAGE_CMDLINE_HACK is not set
|
||||
# CONFIG_IMQ is not set
|
||||
# CONFIG_IMQ_BEHAVIOR_AA is not set
|
||||
# CONFIG_IMQ_BEHAVIOR_AB is not set
|
||||
# CONFIG_IMQ_BEHAVIOR_BA is not set
|
||||
# CONFIG_IMQ_BEHAVIOR_BB is not set
|
||||
CONFIG_IMQ_NUM_DEVS=2
|
||||
CONFIG_INET=y
|
||||
# CONFIG_INET6_AH is not set
|
||||
# CONFIG_INET6_ESP is not set
|
||||
|
|
|
|||
|
|
@ -857,12 +857,6 @@ CONFIG_IDE_PROC_FS=y
|
|||
# CONFIG_IKCONFIG is not set
|
||||
# CONFIG_IKCONFIG_PROC is not set
|
||||
# CONFIG_IMAGE_CMDLINE_HACK is not set
|
||||
# CONFIG_IMQ is not set
|
||||
# CONFIG_IMQ_BEHAVIOR_AA is not set
|
||||
# CONFIG_IMQ_BEHAVIOR_AB is not set
|
||||
# CONFIG_IMQ_BEHAVIOR_BA is not set
|
||||
# CONFIG_IMQ_BEHAVIOR_BB is not set
|
||||
CONFIG_IMQ_NUM_DEVS=2
|
||||
CONFIG_INET=y
|
||||
# CONFIG_INET6_AH is not set
|
||||
# CONFIG_INET6_ESP is not set
|
||||
|
|
|
|||
|
|
@ -894,12 +894,6 @@ CONFIG_IDE_PROC_FS=y
|
|||
# CONFIG_IKCONFIG is not set
|
||||
# CONFIG_IKCONFIG_PROC is not set
|
||||
# CONFIG_IMAGE_CMDLINE_HACK is not set
|
||||
# CONFIG_IMQ is not set
|
||||
# CONFIG_IMQ_BEHAVIOR_AA is not set
|
||||
# CONFIG_IMQ_BEHAVIOR_AB is not set
|
||||
# CONFIG_IMQ_BEHAVIOR_BA is not set
|
||||
# CONFIG_IMQ_BEHAVIOR_BB is not set
|
||||
CONFIG_IMQ_NUM_DEVS=2
|
||||
CONFIG_INET=y
|
||||
# CONFIG_INET6_AH is not set
|
||||
# CONFIG_INET6_ESP is not set
|
||||
|
|
|
|||
|
|
@ -929,12 +929,6 @@ CONFIG_IDE_PROC_FS=y
|
|||
# CONFIG_IKCONFIG is not set
|
||||
# CONFIG_IKCONFIG_PROC is not set
|
||||
# CONFIG_IMAGE_CMDLINE_HACK is not set
|
||||
# CONFIG_IMQ is not set
|
||||
# CONFIG_IMQ_BEHAVIOR_AA is not set
|
||||
# CONFIG_IMQ_BEHAVIOR_AB is not set
|
||||
# CONFIG_IMQ_BEHAVIOR_BA is not set
|
||||
# CONFIG_IMQ_BEHAVIOR_BB is not set
|
||||
CONFIG_IMQ_NUM_DEVS=2
|
||||
CONFIG_INET=y
|
||||
# CONFIG_INET6_AH is not set
|
||||
# CONFIG_INET6_ESP is not set
|
||||
|
|
|
|||
|
|
@ -877,12 +877,6 @@ CONFIG_IDE_PROC_FS=y
|
|||
# CONFIG_IKCONFIG is not set
|
||||
# CONFIG_IKCONFIG_PROC is not set
|
||||
# CONFIG_IMAGE_CMDLINE_HACK is not set
|
||||
# CONFIG_IMQ is not set
|
||||
# CONFIG_IMQ_BEHAVIOR_AA is not set
|
||||
# CONFIG_IMQ_BEHAVIOR_AB is not set
|
||||
# CONFIG_IMQ_BEHAVIOR_BA is not set
|
||||
# CONFIG_IMQ_BEHAVIOR_BB is not set
|
||||
CONFIG_IMQ_NUM_DEVS=2
|
||||
CONFIG_INET=y
|
||||
# CONFIG_INET6_AH is not set
|
||||
# CONFIG_INET6_ESP is not set
|
||||
|
|
|
|||
|
|
@ -897,12 +897,6 @@ CONFIG_IDE_PROC_FS=y
|
|||
# CONFIG_IKCONFIG is not set
|
||||
# CONFIG_IKCONFIG_PROC is not set
|
||||
# CONFIG_IMAGE_CMDLINE_HACK is not set
|
||||
# CONFIG_IMQ is not set
|
||||
# CONFIG_IMQ_BEHAVIOR_AA is not set
|
||||
# CONFIG_IMQ_BEHAVIOR_AB is not set
|
||||
# CONFIG_IMQ_BEHAVIOR_BA is not set
|
||||
# CONFIG_IMQ_BEHAVIOR_BB is not set
|
||||
CONFIG_IMQ_NUM_DEVS=2
|
||||
CONFIG_INET=y
|
||||
# CONFIG_INET6_AH is not set
|
||||
# CONFIG_INET6_ESP is not set
|
||||
|
|
|
|||
|
|
@ -903,12 +903,6 @@ CONFIG_IDE_PROC_FS=y
|
|||
# CONFIG_IKCONFIG is not set
|
||||
# CONFIG_IKCONFIG_PROC is not set
|
||||
# CONFIG_IMAGE_CMDLINE_HACK is not set
|
||||
# CONFIG_IMQ_BEHAVIOR_AA is not set
|
||||
# CONFIG_IMQ_BEHAVIOR_AB is not set
|
||||
# CONFIG_IMQ_BEHAVIOR_BA is not set
|
||||
# CONFIG_IMQ_BEHAVIOR_BB is not set
|
||||
# CONFIG_IMQ is not set
|
||||
CONFIG_IMQ_NUM_DEVS=2
|
||||
# CONFIG_INET6_AH is not set
|
||||
# CONFIG_INET6_ESP is not set
|
||||
# CONFIG_INET6_IPCOMP is not set
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -8,7 +8,7 @@
|
|||
depends on NETFILTER_ADVANCED
|
||||
help
|
||||
H.323 is a VoIP signalling protocol from ITU-T. As one of the most
|
||||
@@ -505,7 +504,6 @@ config NETFILTER_XT_TARGET_SECMARK
|
||||
@@ -493,7 +492,6 @@ config NETFILTER_XT_TARGET_SECMARK
|
||||
|
||||
config NETFILTER_XT_TARGET_TCPMSS
|
||||
tristate '"TCPMSS" target support'
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- a/include/linux/skbuff.h
|
||||
+++ b/include/linux/skbuff.h
|
||||
@@ -1369,11 +1369,18 @@ static inline int skb_network_offset(con
|
||||
@@ -1351,11 +1351,18 @@ static inline int skb_network_offset(con
|
||||
*
|
||||
* Various parts of the networking layer expect at least 32 bytes of
|
||||
* headroom, you should not reduce this.
|
||||
|
|
@ -19,7 +19,7 @@
|
|||
extern int ___pskb_trim(struct sk_buff *skb, unsigned int len);
|
||||
|
||||
static inline void __skb_trim(struct sk_buff *skb, unsigned int len)
|
||||
@@ -1463,9 +1470,9 @@ static inline void __skb_queue_purge(str
|
||||
@@ -1445,9 +1452,9 @@ static inline void __skb_queue_purge(str
|
||||
static inline struct sk_buff *__dev_alloc_skb(unsigned int length,
|
||||
gfp_t gfp_mask)
|
||||
{
|
||||
|
|
@ -31,7 +31,7 @@
|
|||
return skb;
|
||||
}
|
||||
|
||||
@@ -1538,7 +1545,7 @@ static inline int __skb_cow(struct sk_bu
|
||||
@@ -1520,7 +1527,7 @@ static inline int __skb_cow(struct sk_bu
|
||||
delta = headroom - skb_headroom(skb);
|
||||
|
||||
if (delta || cloned)
|
||||
|
|
@ -42,7 +42,7 @@
|
|||
}
|
||||
--- a/net/core/skbuff.c
|
||||
+++ b/net/core/skbuff.c
|
||||
@@ -327,9 +327,9 @@ struct sk_buff *__netdev_alloc_skb(struc
|
||||
@@ -250,9 +250,9 @@ struct sk_buff *__netdev_alloc_skb(struc
|
||||
int node = dev->dev.parent ? dev_to_node(dev->dev.parent) : -1;
|
||||
struct sk_buff *skb;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- a/include/linux/phy.h
|
||||
+++ b/include/linux/phy.h
|
||||
@@ -393,9 +393,18 @@ struct phy_driver {
|
||||
@@ -379,9 +379,18 @@ struct phy_driver {
|
||||
*/
|
||||
int (*config_aneg)(struct phy_device *phydev);
|
||||
|
||||
|
|
@ -21,7 +21,7 @@
|
|||
|
||||
--- a/drivers/net/phy/phy_device.c
|
||||
+++ b/drivers/net/phy/phy_device.c
|
||||
@@ -695,6 +695,9 @@ int genphy_update_link(struct phy_device
|
||||
@@ -590,6 +590,9 @@ int genphy_update_link(struct phy_device
|
||||
{
|
||||
int status;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
--- a/drivers/net/phy/Kconfig
|
||||
+++ b/drivers/net/phy/Kconfig
|
||||
@@ -100,6 +100,10 @@ config IP175C_PHY
|
||||
tristate "Driver for IC+ IP175C/IP178C switches"
|
||||
@@ -100,6 +100,10 @@ config IP17XX_PHY
|
||||
tristate "Driver for IC+ IP17xx switches"
|
||||
select SWCONFIG
|
||||
|
||||
+config AR8216_PHY
|
||||
|
|
@ -15,7 +15,7 @@
|
|||
+++ b/drivers/net/phy/Makefile
|
||||
@@ -17,6 +17,7 @@ obj-$(CONFIG_ADM6996_PHY) += adm6996.o
|
||||
obj-$(CONFIG_MVSWITCH_PHY) += mvswitch.o
|
||||
obj-$(CONFIG_IP175C_PHY) += ip175c.o
|
||||
obj-$(CONFIG_IP17XX_PHY) += ip17xx.o
|
||||
obj-$(CONFIG_REALTEK_PHY) += realtek.o
|
||||
+obj-$(CONFIG_AR8216_PHY) += ar8216.o
|
||||
obj-$(CONFIG_LSI_ET1011C_PHY) += et1011c.o
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
--- a/drivers/net/phy/Makefile
|
||||
+++ b/drivers/net/phy/Makefile
|
||||
@@ -18,6 +18,7 @@ obj-$(CONFIG_MVSWITCH_PHY) += mvswitch.o
|
||||
obj-$(CONFIG_IP175C_PHY) += ip175c.o
|
||||
obj-$(CONFIG_IP17XX_PHY) += ip17xx.o
|
||||
obj-$(CONFIG_REALTEK_PHY) += realtek.o
|
||||
obj-$(CONFIG_AR8216_PHY) += ar8216.o
|
||||
+obj-$(CONFIG_RTL8306_PHY) += rtl8306.o
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@
|
|||
endif # PHYLIB
|
||||
--- a/drivers/net/phy/Makefile
|
||||
+++ b/drivers/net/phy/Makefile
|
||||
@@ -19,6 +19,9 @@ obj-$(CONFIG_IP175C_PHY) += ip175c.o
|
||||
@@ -19,6 +19,9 @@ obj-$(CONFIG_IP17XX_PHY) += ip17xx.o
|
||||
obj-$(CONFIG_REALTEK_PHY) += realtek.o
|
||||
obj-$(CONFIG_AR8216_PHY) += ar8216.o
|
||||
obj-$(CONFIG_RTL8306_PHY) += rtl8306.o
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
# define LL_MAX_HEADER 96
|
||||
--- a/include/linux/skbuff.h
|
||||
+++ b/include/linux/skbuff.h
|
||||
@@ -387,7 +387,7 @@ struct sk_buff {
|
||||
@@ -378,7 +378,7 @@ struct sk_buff {
|
||||
#ifdef CONFIG_IPV6_NDISC_NODETYPE
|
||||
__u8 ndisc_nodetype:2;
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -1,7 +1,5 @@
|
|||
Index: linux-2.6.30.10/drivers/char/random.c
|
||||
===================================================================
|
||||
--- linux-2.6.30.10.orig/drivers/char/random.c 2009-12-04 07:00:07.000000000 +0100
|
||||
+++ linux-2.6.30.10/drivers/char/random.c 2010-05-15 15:44:19.000000000 +0200
|
||||
--- a/drivers/char/random.c
|
||||
+++ b/drivers/char/random.c
|
||||
@@ -129,6 +129,9 @@
|
||||
* unsigned int value);
|
||||
* void add_interrupt_randomness(int irq);
|
||||
|
|
@ -26,7 +24,7 @@ Index: linux-2.6.30.10/drivers/char/random.c
|
|||
* All of these routines try to estimate how many bits of randomness a
|
||||
* particular randomness source. They do this by keeping track of the
|
||||
* first and second order deltas of the event timings.
|
||||
@@ -712,6 +722,61 @@
|
||||
@@ -712,6 +722,61 @@ void add_disk_randomness(struct gendisk
|
||||
}
|
||||
#endif
|
||||
|
||||
|
|
@ -88,11 +86,9 @@ Index: linux-2.6.30.10/drivers/char/random.c
|
|||
#define EXTRACT_SIZE 10
|
||||
|
||||
/*********************************************************************
|
||||
Index: linux-2.6.30.10/fs/fcntl.c
|
||||
===================================================================
|
||||
--- linux-2.6.30.10.orig/fs/fcntl.c 2009-12-04 07:00:07.000000000 +0100
|
||||
+++ linux-2.6.30.10/fs/fcntl.c 2010-05-15 15:44:19.000000000 +0200
|
||||
@@ -142,6 +142,7 @@
|
||||
--- a/fs/fcntl.c
|
||||
+++ b/fs/fcntl.c
|
||||
@@ -142,6 +142,7 @@ SYSCALL_DEFINE1(dup, unsigned int, filde
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
|
@ -100,10 +96,8 @@ Index: linux-2.6.30.10/fs/fcntl.c
|
|||
|
||||
#define SETFL_MASK (O_APPEND | O_NONBLOCK | O_NDELAY | O_DIRECT | O_NOATIME)
|
||||
|
||||
Index: linux-2.6.30.10/include/linux/miscdevice.h
|
||||
===================================================================
|
||||
--- linux-2.6.30.10.orig/include/linux/miscdevice.h 2009-12-04 07:00:07.000000000 +0100
|
||||
+++ linux-2.6.30.10/include/linux/miscdevice.h 2010-05-15 15:44:19.000000000 +0200
|
||||
--- a/include/linux/miscdevice.h
|
||||
+++ b/include/linux/miscdevice.h
|
||||
@@ -12,6 +12,7 @@
|
||||
#define APOLLO_MOUSE_MINOR 7
|
||||
#define PC110PAD_MINOR 9
|
||||
|
|
@ -112,10 +106,8 @@ Index: linux-2.6.30.10/include/linux/miscdevice.h
|
|||
#define WATCHDOG_MINOR 130 /* Watchdog timer */
|
||||
#define TEMP_MINOR 131 /* Temperature Sensor */
|
||||
#define RTC_MINOR 135
|
||||
Index: linux-2.6.30.10/include/linux/random.h
|
||||
===================================================================
|
||||
--- linux-2.6.30.10.orig/include/linux/random.h 2009-12-04 07:00:07.000000000 +0100
|
||||
+++ linux-2.6.30.10/include/linux/random.h 2010-05-15 15:44:19.000000000 +0200
|
||||
--- a/include/linux/random.h
|
||||
+++ b/include/linux/random.h
|
||||
@@ -9,6 +9,7 @@
|
||||
|
||||
#include <linux/types.h>
|
||||
|
|
@ -155,7 +147,7 @@ Index: linux-2.6.30.10/include/linux/random.h
|
|||
struct rand_pool_info {
|
||||
int entropy_count;
|
||||
int buf_size;
|
||||
@@ -50,6 +75,10 @@
|
||||
@@ -50,6 +75,10 @@ extern void add_input_randomness(unsigne
|
||||
unsigned int value);
|
||||
extern void add_interrupt_randomness(int irq);
|
||||
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -127,11 +127,10 @@
|
|||
|
||||
e = (struct ipt_entry *)(loc_cpu_entry + off);
|
||||
if (copy_to_user(userptr + off
|
||||
@@ -1001,6 +1041,14 @@ copy_entries_to_user(unsigned int total_
|
||||
ret = -EFAULT;
|
||||
@@ -1002,6 +1042,14 @@ copy_entries_to_user(unsigned int total_
|
||||
goto free_counters;
|
||||
}
|
||||
+
|
||||
|
||||
+ flags = e->ip.flags & ~IPT_F_NO_DEF_MATCH;
|
||||
+ if (copy_to_user(userptr + off
|
||||
+ + offsetof(struct ipt_entry, ip.flags),
|
||||
|
|
@ -139,6 +138,7 @@
|
|||
+ ret = -EFAULT;
|
||||
+ goto free_counters;
|
||||
+ }
|
||||
|
||||
+
|
||||
for (i = sizeof(struct ipt_entry);
|
||||
i < e->target_offset;
|
||||
i += m->u.match_size) {
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -8,7 +8,7 @@
|
|||
depends on NETFILTER_ADVANCED
|
||||
help
|
||||
H.323 is a VoIP signalling protocol from ITU-T. As one of the most
|
||||
@@ -505,7 +504,6 @@ config NETFILTER_XT_TARGET_SECMARK
|
||||
@@ -493,7 +492,6 @@ config NETFILTER_XT_TARGET_SECMARK
|
||||
|
||||
config NETFILTER_XT_TARGET_TCPMSS
|
||||
tristate '"TCPMSS" target support'
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- a/include/linux/skbuff.h
|
||||
+++ b/include/linux/skbuff.h
|
||||
@@ -1384,11 +1384,18 @@ static inline int skb_network_offset(con
|
||||
@@ -1365,11 +1365,18 @@ static inline int skb_network_offset(con
|
||||
*
|
||||
* Various parts of the networking layer expect at least 32 bytes of
|
||||
* headroom, you should not reduce this.
|
||||
|
|
@ -19,7 +19,7 @@
|
|||
extern int ___pskb_trim(struct sk_buff *skb, unsigned int len);
|
||||
|
||||
static inline void __skb_trim(struct sk_buff *skb, unsigned int len)
|
||||
@@ -1478,9 +1485,9 @@ static inline void __skb_queue_purge(str
|
||||
@@ -1459,9 +1466,9 @@ static inline void __skb_queue_purge(str
|
||||
static inline struct sk_buff *__dev_alloc_skb(unsigned int length,
|
||||
gfp_t gfp_mask)
|
||||
{
|
||||
|
|
@ -31,7 +31,7 @@
|
|||
return skb;
|
||||
}
|
||||
|
||||
@@ -1553,7 +1560,7 @@ static inline int __skb_cow(struct sk_bu
|
||||
@@ -1534,7 +1541,7 @@ static inline int __skb_cow(struct sk_bu
|
||||
delta = headroom - skb_headroom(skb);
|
||||
|
||||
if (delta || cloned)
|
||||
|
|
@ -42,7 +42,7 @@
|
|||
}
|
||||
--- a/net/core/skbuff.c
|
||||
+++ b/net/core/skbuff.c
|
||||
@@ -339,9 +339,9 @@ struct sk_buff *__netdev_alloc_skb(struc
|
||||
@@ -259,9 +259,9 @@ struct sk_buff *__netdev_alloc_skb(struc
|
||||
int node = dev->dev.parent ? dev_to_node(dev->dev.parent) : -1;
|
||||
struct sk_buff *skb;
|
||||
|
||||
|
|
|
|||
|
|
@ -11038,14 +11038,14 @@
|
|||
+ yaffs_UnpackTags2(tags, &pt);
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
|
||||
- if(tags && retval == -EBADMSG && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR)
|
||||
- tags->eccResult = YAFFS_ECC_RESULT_UNFIXED;
|
||||
+ if (localData)
|
||||
+ yaffs_ReleaseTempBuffer(dev, data, __LINE__);
|
||||
|
||||
- if(tags && retval == -EBADMSG && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR)
|
||||
+ if (tags && retval == -EBADMSG && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR)
|
||||
tags->eccResult = YAFFS_ECC_RESULT_UNFIXED;
|
||||
-
|
||||
+ tags->eccResult = YAFFS_ECC_RESULT_UNFIXED;
|
||||
if (retval == 0)
|
||||
return YAFFS_OK;
|
||||
else
|
||||
|
|
|
|||
|
|
@ -343,10 +343,7 @@
|
|||
+static int ssb_pcmcia_get_mac(struct pcmcia_device *p_dev,
|
||||
+ tuple_t *tuple,
|
||||
+ void *priv)
|
||||
{
|
||||
- tuple_t tuple;
|
||||
- int res;
|
||||
- unsigned char buf[32];
|
||||
+{
|
||||
+ struct ssb_sprom *sprom = priv;
|
||||
+
|
||||
+ if (tuple->TupleData[0] != CISTPL_FUNCE_LAN_NODE_ID)
|
||||
|
|
@ -362,7 +359,10 @@
|
|||
+static int ssb_pcmcia_do_get_invariants(struct pcmcia_device *p_dev,
|
||||
+ tuple_t *tuple,
|
||||
+ void *priv)
|
||||
+{
|
||||
{
|
||||
- tuple_t tuple;
|
||||
- int res;
|
||||
- unsigned char buf[32];
|
||||
+ struct ssb_init_invariants *iv = priv;
|
||||
struct ssb_sprom *sprom = &iv->sprom;
|
||||
struct ssb_boardinfo *bi = &iv->boardinfo;
|
||||
|
|
|
|||
|
|
@ -127,11 +127,10 @@
|
|||
|
||||
e = (struct ipt_entry *)(loc_cpu_entry + off);
|
||||
if (copy_to_user(userptr + off
|
||||
@@ -1000,6 +1040,14 @@ copy_entries_to_user(unsigned int total_
|
||||
ret = -EFAULT;
|
||||
@@ -1001,6 +1041,14 @@ copy_entries_to_user(unsigned int total_
|
||||
goto free_counters;
|
||||
}
|
||||
+
|
||||
|
||||
+ flags = e->ip.flags & ~IPT_F_NO_DEF_MATCH;
|
||||
+ if (copy_to_user(userptr + off
|
||||
+ + offsetof(struct ipt_entry, ip.flags),
|
||||
|
|
@ -139,6 +138,7 @@
|
|||
+ ret = -EFAULT;
|
||||
+ goto free_counters;
|
||||
+ }
|
||||
|
||||
+
|
||||
for (i = sizeof(struct ipt_entry);
|
||||
i < e->target_offset;
|
||||
i += m->u.match_size) {
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -8,7 +8,7 @@
|
|||
depends on NETFILTER_ADVANCED
|
||||
help
|
||||
H.323 is a VoIP signalling protocol from ITU-T. As one of the most
|
||||
@@ -530,7 +529,6 @@ config NETFILTER_XT_TARGET_SECMARK
|
||||
@@ -518,7 +517,6 @@ config NETFILTER_XT_TARGET_SECMARK
|
||||
|
||||
config NETFILTER_XT_TARGET_TCPMSS
|
||||
tristate '"TCPMSS" target support'
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- a/include/linux/skbuff.h
|
||||
+++ b/include/linux/skbuff.h
|
||||
@@ -1372,11 +1372,18 @@ static inline int skb_network_offset(con
|
||||
@@ -1353,11 +1353,18 @@ static inline int skb_network_offset(con
|
||||
*
|
||||
* Various parts of the networking layer expect at least 32 bytes of
|
||||
* headroom, you should not reduce this.
|
||||
|
|
@ -19,7 +19,7 @@
|
|||
extern int ___pskb_trim(struct sk_buff *skb, unsigned int len);
|
||||
|
||||
static inline void __skb_trim(struct sk_buff *skb, unsigned int len)
|
||||
@@ -1466,9 +1473,9 @@ static inline void __skb_queue_purge(str
|
||||
@@ -1447,9 +1454,9 @@ static inline void __skb_queue_purge(str
|
||||
static inline struct sk_buff *__dev_alloc_skb(unsigned int length,
|
||||
gfp_t gfp_mask)
|
||||
{
|
||||
|
|
@ -31,7 +31,7 @@
|
|||
return skb;
|
||||
}
|
||||
|
||||
@@ -1551,7 +1558,7 @@ static inline int __skb_cow(struct sk_bu
|
||||
@@ -1532,7 +1539,7 @@ static inline int __skb_cow(struct sk_bu
|
||||
delta = headroom - skb_headroom(skb);
|
||||
|
||||
if (delta || cloned)
|
||||
|
|
@ -42,7 +42,7 @@
|
|||
}
|
||||
--- a/net/core/skbuff.c
|
||||
+++ b/net/core/skbuff.c
|
||||
@@ -339,9 +339,9 @@ struct sk_buff *__netdev_alloc_skb(struc
|
||||
@@ -259,9 +259,9 @@ struct sk_buff *__netdev_alloc_skb(struc
|
||||
int node = dev->dev.parent ? dev_to_node(dev->dev.parent) : -1;
|
||||
struct sk_buff *skb;
|
||||
|
||||
|
|
|
|||
|
|
@ -140,7 +140,7 @@
|
|||
+module_exit(connmark_cleanup_module);
|
||||
--- a/net/sched/Kconfig
|
||||
+++ b/net/sched/Kconfig
|
||||
@@ -549,6 +549,18 @@
|
||||
@@ -549,6 +549,18 @@ config NET_ACT_SKBEDIT
|
||||
To compile this code as a module, choose M here: the
|
||||
module will be called act_skbedit.
|
||||
|
||||
|
|
@ -161,7 +161,7 @@
|
|||
depends on NET_CLS_U32 || NET_CLS_FW
|
||||
--- a/net/sched/Makefile
|
||||
+++ b/net/sched/Makefile
|
||||
@@ -15,6 +15,7 @@
|
||||
@@ -15,6 +15,7 @@ obj-$(CONFIG_NET_ACT_NAT) += act_nat.o
|
||||
obj-$(CONFIG_NET_ACT_PEDIT) += act_pedit.o
|
||||
obj-$(CONFIG_NET_ACT_SIMP) += act_simple.o
|
||||
obj-$(CONFIG_NET_ACT_SKBEDIT) += act_skbedit.o
|
||||
|
|
|
|||
|
|
@ -11038,14 +11038,14 @@
|
|||
+ yaffs_UnpackTags2(tags, &pt);
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
|
||||
- if(tags && retval == -EBADMSG && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR)
|
||||
- tags->eccResult = YAFFS_ECC_RESULT_UNFIXED;
|
||||
+ if (localData)
|
||||
+ yaffs_ReleaseTempBuffer(dev, data, __LINE__);
|
||||
|
||||
- if(tags && retval == -EBADMSG && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR)
|
||||
+ if (tags && retval == -EBADMSG && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR)
|
||||
tags->eccResult = YAFFS_ECC_RESULT_UNFIXED;
|
||||
-
|
||||
+ tags->eccResult = YAFFS_ECC_RESULT_UNFIXED;
|
||||
if (retval == 0)
|
||||
return YAFFS_OK;
|
||||
else
|
||||
|
|
|
|||
|
|
@ -132,11 +132,10 @@
|
|||
|
||||
e = (struct ipt_entry *)(loc_cpu_entry + off);
|
||||
if (copy_to_user(userptr + off
|
||||
@@ -979,6 +1020,14 @@ copy_entries_to_user(unsigned int total_
|
||||
ret = -EFAULT;
|
||||
@@ -980,6 +1021,14 @@ copy_entries_to_user(unsigned int total_
|
||||
goto free_counters;
|
||||
}
|
||||
+
|
||||
|
||||
+ flags = e->ip.flags & ~IPT_F_NO_DEF_MATCH;
|
||||
+ if (copy_to_user(userptr + off
|
||||
+ + offsetof(struct ipt_entry, ip.flags),
|
||||
|
|
@ -144,6 +143,7 @@
|
|||
+ ret = -EFAULT;
|
||||
+ goto free_counters;
|
||||
+ }
|
||||
|
||||
+
|
||||
for (i = sizeof(struct ipt_entry);
|
||||
i < e->target_offset;
|
||||
i += m->u.match_size) {
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -8,7 +8,7 @@
|
|||
depends on NETFILTER_ADVANCED
|
||||
help
|
||||
H.323 is a VoIP signalling protocol from ITU-T. As one of the most
|
||||
@@ -562,7 +561,6 @@ config NETFILTER_XT_TARGET_SECMARK
|
||||
@@ -550,7 +549,6 @@ config NETFILTER_XT_TARGET_SECMARK
|
||||
|
||||
config NETFILTER_XT_TARGET_TCPMSS
|
||||
tristate '"TCPMSS" target support'
|
||||
|
|
|
|||
|
|
@ -140,7 +140,7 @@
|
|||
+module_exit(connmark_cleanup_module);
|
||||
--- a/net/sched/Kconfig
|
||||
+++ b/net/sched/Kconfig
|
||||
@@ -549,6 +549,18 @@
|
||||
@@ -549,6 +549,18 @@ config NET_ACT_SKBEDIT
|
||||
To compile this code as a module, choose M here: the
|
||||
module will be called act_skbedit.
|
||||
|
||||
|
|
@ -161,7 +161,7 @@
|
|||
depends on NET_CLS_U32 || NET_CLS_FW
|
||||
--- a/net/sched/Makefile
|
||||
+++ b/net/sched/Makefile
|
||||
@@ -15,6 +15,7 @@
|
||||
@@ -15,6 +15,7 @@ obj-$(CONFIG_NET_ACT_NAT) += act_nat.o
|
||||
obj-$(CONFIG_NET_ACT_PEDIT) += act_pedit.o
|
||||
obj-$(CONFIG_NET_ACT_SIMP) += act_simple.o
|
||||
obj-$(CONFIG_NET_ACT_SKBEDIT) += act_skbedit.o
|
||||
|
|
|
|||
|
|
@ -11038,14 +11038,14 @@
|
|||
+ yaffs_UnpackTags2(tags, &pt);
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
|
||||
- if(tags && retval == -EBADMSG && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR)
|
||||
- tags->eccResult = YAFFS_ECC_RESULT_UNFIXED;
|
||||
+ if (localData)
|
||||
+ yaffs_ReleaseTempBuffer(dev, data, __LINE__);
|
||||
|
||||
- if(tags && retval == -EBADMSG && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR)
|
||||
+ if (tags && retval == -EBADMSG && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR)
|
||||
tags->eccResult = YAFFS_ECC_RESULT_UNFIXED;
|
||||
-
|
||||
+ tags->eccResult = YAFFS_ECC_RESULT_UNFIXED;
|
||||
if (retval == 0)
|
||||
return YAFFS_OK;
|
||||
else
|
||||
|
|
|
|||
|
|
@ -132,11 +132,10 @@
|
|||
|
||||
e = (struct ipt_entry *)(loc_cpu_entry + off);
|
||||
if (copy_to_user(userptr + off
|
||||
@@ -983,6 +1024,14 @@ copy_entries_to_user(unsigned int total_
|
||||
ret = -EFAULT;
|
||||
@@ -984,6 +1025,14 @@ copy_entries_to_user(unsigned int total_
|
||||
goto free_counters;
|
||||
}
|
||||
+
|
||||
|
||||
+ flags = e->ip.flags & ~IPT_F_NO_DEF_MATCH;
|
||||
+ if (copy_to_user(userptr + off
|
||||
+ + offsetof(struct ipt_entry, ip.flags),
|
||||
|
|
@ -144,6 +143,7 @@
|
|||
+ ret = -EFAULT;
|
||||
+ goto free_counters;
|
||||
+ }
|
||||
|
||||
+
|
||||
for (i = sizeof(struct ipt_entry);
|
||||
i < e->target_offset;
|
||||
i += m->u.match_size) {
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -8,7 +8,7 @@
|
|||
depends on NETFILTER_ADVANCED
|
||||
help
|
||||
H.323 is a VoIP signalling protocol from ITU-T. As one of the most
|
||||
@@ -569,7 +568,6 @@ config NETFILTER_XT_TARGET_SECMARK
|
||||
@@ -557,7 +556,6 @@ config NETFILTER_XT_TARGET_SECMARK
|
||||
|
||||
config NETFILTER_XT_TARGET_TCPMSS
|
||||
tristate '"TCPMSS" target support'
|
||||
|
|
|
|||
|
|
@ -140,7 +140,7 @@
|
|||
+module_exit(connmark_cleanup_module);
|
||||
--- a/net/sched/Kconfig
|
||||
+++ b/net/sched/Kconfig
|
||||
@@ -549,6 +549,18 @@
|
||||
@@ -549,6 +549,18 @@ config NET_ACT_SKBEDIT
|
||||
To compile this code as a module, choose M here: the
|
||||
module will be called act_skbedit.
|
||||
|
||||
|
|
@ -161,7 +161,7 @@
|
|||
depends on NET_CLS_U32 || NET_CLS_FW
|
||||
--- a/net/sched/Makefile
|
||||
+++ b/net/sched/Makefile
|
||||
@@ -15,6 +15,7 @@
|
||||
@@ -15,6 +15,7 @@ obj-$(CONFIG_NET_ACT_NAT) += act_nat.o
|
||||
obj-$(CONFIG_NET_ACT_PEDIT) += act_pedit.o
|
||||
obj-$(CONFIG_NET_ACT_SIMP) += act_simple.o
|
||||
obj-$(CONFIG_NET_ACT_SKBEDIT) += act_skbedit.o
|
||||
|
|
|
|||
|
|
@ -11038,14 +11038,14 @@
|
|||
+ yaffs_UnpackTags2(tags, &pt);
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
|
||||
- if(tags && retval == -EBADMSG && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR)
|
||||
- tags->eccResult = YAFFS_ECC_RESULT_UNFIXED;
|
||||
+ if (localData)
|
||||
+ yaffs_ReleaseTempBuffer(dev, data, __LINE__);
|
||||
|
||||
- if(tags && retval == -EBADMSG && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR)
|
||||
+ if (tags && retval == -EBADMSG && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR)
|
||||
tags->eccResult = YAFFS_ECC_RESULT_UNFIXED;
|
||||
-
|
||||
+ tags->eccResult = YAFFS_ECC_RESULT_UNFIXED;
|
||||
if (retval == 0)
|
||||
return YAFFS_OK;
|
||||
else
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -8,7 +8,7 @@
|
|||
depends on NETFILTER_ADVANCED
|
||||
help
|
||||
H.323 is a VoIP signalling protocol from ITU-T. As one of the most
|
||||
@@ -570,7 +569,6 @@ config NETFILTER_XT_TARGET_SECMARK
|
||||
@@ -558,7 +557,6 @@ config NETFILTER_XT_TARGET_SECMARK
|
||||
|
||||
config NETFILTER_XT_TARGET_TCPMSS
|
||||
tristate '"TCPMSS" target support'
|
||||
|
|
|
|||
|
|
@ -140,7 +140,7 @@
|
|||
+module_exit(connmark_cleanup_module);
|
||||
--- a/net/sched/Kconfig
|
||||
+++ b/net/sched/Kconfig
|
||||
@@ -559,6 +559,18 @@
|
||||
@@ -559,6 +559,18 @@ config NET_ACT_CSUM
|
||||
To compile this code as a module, choose M here: the
|
||||
module will be called act_csum.
|
||||
|
||||
|
|
@ -161,7 +161,7 @@
|
|||
depends on NET_CLS_U32 || NET_CLS_FW
|
||||
--- a/net/sched/Makefile
|
||||
+++ b/net/sched/Makefile
|
||||
@@ -16,6 +16,7 @@
|
||||
@@ -16,6 +16,7 @@ obj-$(CONFIG_NET_ACT_PEDIT) += act_pedit
|
||||
obj-$(CONFIG_NET_ACT_SIMP) += act_simple.o
|
||||
obj-$(CONFIG_NET_ACT_SKBEDIT) += act_skbedit.o
|
||||
obj-$(CONFIG_NET_ACT_CSUM) += act_csum.o
|
||||
|
|
|
|||
|
|
@ -11038,14 +11038,14 @@
|
|||
+ yaffs_UnpackTags2(tags, &pt);
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
|
||||
- if(tags && retval == -EBADMSG && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR)
|
||||
- tags->eccResult = YAFFS_ECC_RESULT_UNFIXED;
|
||||
+ if (localData)
|
||||
+ yaffs_ReleaseTempBuffer(dev, data, __LINE__);
|
||||
|
||||
- if(tags && retval == -EBADMSG && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR)
|
||||
+ if (tags && retval == -EBADMSG && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR)
|
||||
tags->eccResult = YAFFS_ECC_RESULT_UNFIXED;
|
||||
-
|
||||
+ tags->eccResult = YAFFS_ECC_RESULT_UNFIXED;
|
||||
if (retval == 0)
|
||||
return YAFFS_OK;
|
||||
else
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue