diff options
| author | Imre Kaloz <kaloz@openwrt.org> | 2009-11-30 11:45:37 +0000 |
|---|---|---|
| committer | Imre Kaloz <kaloz@openwrt.org> | 2009-11-30 11:45:37 +0000 |
| commit | a4b3263ded693a934da7aec5e5fdd072ae21e287 (patch) | |
| tree | 8297f25bda88f7034780f9f583fead1a6b49eed3 | |
| parent | db55512b28bf8aa0e3547d005576a76645593f89 (diff) | |
| download | upstream-a4b3263ded693a934da7aec5e5fdd072ae21e287.tar.gz upstream-a4b3263ded693a934da7aec5e5fdd072ae21e287.tar.bz2 upstream-a4b3263ded693a934da7aec5e5fdd072ae21e287.zip | |
refresh 2.6.32 patches with -rc8
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@18613 3c298f89-4303-0410-b956-a3cf2f4a3e73
4 files changed, 8 insertions, 8 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.32/020-mips_multi_machine_support.patch b/target/linux/generic-2.6/patches-2.6.32/020-mips_multi_machine_support.patch index 1b29290e5e..3ffd2f3317 100644 --- a/target/linux/generic-2.6/patches-2.6.32/020-mips_multi_machine_support.patch +++ b/target/linux/generic-2.6/patches-2.6.32/020-mips_multi_machine_support.patch @@ -132,7 +132,7 @@ --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig -@@ -839,6 +839,9 @@ config MIPS_DISABLE_OBSOLETE_IDE +@@ -840,6 +840,9 @@ config MIPS_DISABLE_OBSOLETE_IDE config SYNC_R4K bool diff --git a/target/linux/generic-2.6/patches-2.6.32/021-mips_image_cmdline_hack.patch b/target/linux/generic-2.6/patches-2.6.32/021-mips_image_cmdline_hack.patch index b63c763041..5efd93d35f 100644 --- a/target/linux/generic-2.6/patches-2.6.32/021-mips_image_cmdline_hack.patch +++ b/target/linux/generic-2.6/patches-2.6.32/021-mips_image_cmdline_hack.patch @@ -1,6 +1,6 @@ --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig -@@ -842,6 +842,10 @@ config SYNC_R4K +@@ -843,6 +843,10 @@ config SYNC_R4K config MIPS_MACHINE def_bool n diff --git a/target/linux/generic-2.6/patches-2.6.32/025-mips_disable_fpu.patch b/target/linux/generic-2.6/patches-2.6.32/025-mips_disable_fpu.patch index 200b750af4..43383916c1 100644 --- a/target/linux/generic-2.6/patches-2.6.32/025-mips_disable_fpu.patch +++ b/target/linux/generic-2.6/patches-2.6.32/025-mips_disable_fpu.patch @@ -8,7 +8,7 @@ Signed-off-by: Florian Fainelli <florian@openwrt.org> -- --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig -@@ -827,6 +827,17 @@ config I8259 +@@ -828,6 +828,17 @@ config I8259 config MIPS_BONITO64 bool @@ -71,7 +71,7 @@ Signed-off-by: Florian Fainelli <florian@openwrt.org> /* Control registers */ #define FPCREG_RID 0 /* $0 = revision id */ -@@ -1273,6 +1275,13 @@ int fpu_emulator_cop1Handler(struct pt_r +@@ -1274,6 +1276,13 @@ int fpu_emulator_cop1Handler(struct pt_r return sig; } diff --git a/target/linux/generic-2.6/patches-2.6.32/150-netfilter_imq.patch b/target/linux/generic-2.6/patches-2.6.32/150-netfilter_imq.patch index 6467a2423e..23636699d8 100644 --- a/target/linux/generic-2.6/patches-2.6.32/150-netfilter_imq.patch +++ b/target/linux/generic-2.6/patches-2.6.32/150-netfilter_imq.patch @@ -834,7 +834,7 @@ #include <linux/proc_fs.h> #include <linux/seq_file.h> #include <linux/stat.h> -@@ -1703,7 +1706,11 @@ int dev_hard_start_xmit(struct sk_buff * +@@ -1704,7 +1707,11 @@ int dev_hard_start_xmit(struct sk_buff * int rc; if (likely(!skb->next)) { @@ -847,7 +847,7 @@ dev_queue_xmit_nit(skb, dev); if (netif_needs_gso(dev, skb)) { -@@ -1788,8 +1795,7 @@ u16 skb_tx_hash(const struct net_device +@@ -1789,8 +1796,7 @@ u16 skb_tx_hash(const struct net_device } EXPORT_SYMBOL(skb_tx_hash); @@ -857,7 +857,7 @@ { const struct net_device_ops *ops = dev->netdev_ops; u16 queue_index = 0; -@@ -1802,6 +1808,7 @@ static struct netdev_queue *dev_pick_tx( +@@ -1803,6 +1809,7 @@ static struct netdev_queue *dev_pick_tx( skb_set_queue_mapping(skb, queue_index); return netdev_get_tx_queue(dev, queue_index); } @@ -1033,7 +1033,7 @@ new->csum = old->csum; new->local_df = old->local_df; new->pkt_type = old->pkt_type; -@@ -2775,6 +2864,13 @@ void __init skb_init(void) +@@ -2776,6 +2865,13 @@ void __init skb_init(void) 0, SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL); |