diff options
Diffstat (limited to 'target')
9 files changed, 28 insertions, 38 deletions
diff --git a/target/linux/atheros/patches-2.6.30/220-enet_micrel_workaround.patch b/target/linux/atheros/patches-2.6.30/220-enet_micrel_workaround.patch index dc7d63d27d..989bd76068 100644 --- a/target/linux/atheros/patches-2.6.30/220-enet_micrel_workaround.patch +++ b/target/linux/atheros/patches-2.6.30/220-enet_micrel_workaround.patch @@ -30,7 +30,7 @@ if (ar231x_mdiobus_probe(dev) != 0) { printk(KERN_ERR "%s: mdiobus_probe failed\n", dev->name); rx_tasklet_cleanup(dev); -@@ -334,8 +350,10 @@ static int __exit ar231x_remove(struct p +@@ -334,8 +350,10 @@ static int __devexit ar231x_remove(struc rx_tasklet_cleanup(dev); ar231x_init_cleanup(dev); unregister_netdev(dev); diff --git a/target/linux/atheros/patches-2.6.33/220-enet_micrel_workaround.patch b/target/linux/atheros/patches-2.6.33/220-enet_micrel_workaround.patch index dc7d63d27d..989bd76068 100644 --- a/target/linux/atheros/patches-2.6.33/220-enet_micrel_workaround.patch +++ b/target/linux/atheros/patches-2.6.33/220-enet_micrel_workaround.patch @@ -30,7 +30,7 @@ if (ar231x_mdiobus_probe(dev) != 0) { printk(KERN_ERR "%s: mdiobus_probe failed\n", dev->name); rx_tasklet_cleanup(dev); -@@ -334,8 +350,10 @@ static int __exit ar231x_remove(struct p +@@ -334,8 +350,10 @@ static int __devexit ar231x_remove(struc rx_tasklet_cleanup(dev); ar231x_init_cleanup(dev); unregister_netdev(dev); diff --git a/target/linux/generic-2.6/patches-2.6.30/023-mips-fix-kexec.patch b/target/linux/generic-2.6/patches-2.6.30/023-mips-fix-kexec.patch index e51005f308..e6928dde91 100644 --- a/target/linux/generic-2.6/patches-2.6.30/023-mips-fix-kexec.patch +++ b/target/linux/generic-2.6/patches-2.6.30/023-mips-fix-kexec.patch @@ -1,6 +1,6 @@ ---- a/arch/mips/kernel/machine_kexec.c 2010-03-15 15:52:04.000000000 +0000 -+++ b/arch/mips/kernel/machine_kexec.c 2010-03-29 12:10:37.000000000 +0100 -@@ -52,7 +52,7 @@ +--- a/arch/mips/kernel/machine_kexec.c ++++ b/arch/mips/kernel/machine_kexec.c +@@ -52,7 +52,7 @@ machine_kexec(struct kimage *image) reboot_code_buffer = (unsigned long)page_address(image->control_code_page); diff --git a/target/linux/generic-2.6/patches-2.6.30/029-mips_kexec.patch b/target/linux/generic-2.6/patches-2.6.30/029-mips_kexec.patch index 49b80e7d4f..0eebacfa3f 100644 --- a/target/linux/generic-2.6/patches-2.6.30/029-mips_kexec.patch +++ b/target/linux/generic-2.6/patches-2.6.30/029-mips_kexec.patch @@ -349,18 +349,7 @@ create mode 100644 arch/mips/kernel/crash_dump.c typedef void (*noretfun_t)(void) __attribute__((noreturn)); void -@@ -52,7 +73,9 @@ machine_kexec(struct kimage *image) - reboot_code_buffer = - (unsigned long)page_address(image->control_code_page); - -- kexec_start_address = image->start; -+ kexec_start_address = -+ (unsigned long) phys_to_virt(image->start); -+ - kexec_indirection_page = - (unsigned long) phys_to_virt(image->head & PAGE_MASK); - -@@ -63,7 +86,7 @@ machine_kexec(struct kimage *image) +@@ -63,7 +84,7 @@ machine_kexec(struct kimage *image) * The generic kexec code builds a page list with physical * addresses. they are directly accessible through KSEG0 (or * CKSEG0 or XPHYS if on 64bit system), hence the @@ -369,7 +358,7 @@ create mode 100644 arch/mips/kernel/crash_dump.c */ for (ptr = &image->head; (entry = *ptr) && !(entry &IND_DONE); ptr = (entry & IND_INDIRECTION) ? -@@ -78,8 +101,39 @@ machine_kexec(struct kimage *image) +@@ -78,8 +99,39 @@ machine_kexec(struct kimage *image) */ local_irq_disable(); diff --git a/target/linux/generic-2.6/patches-2.6.33/023-mips-fix-kexec.patch b/target/linux/generic-2.6/patches-2.6.33/023-mips-fix-kexec.patch index e51005f308..e6928dde91 100644 --- a/target/linux/generic-2.6/patches-2.6.33/023-mips-fix-kexec.patch +++ b/target/linux/generic-2.6/patches-2.6.33/023-mips-fix-kexec.patch @@ -1,6 +1,6 @@ ---- a/arch/mips/kernel/machine_kexec.c 2010-03-15 15:52:04.000000000 +0000 -+++ b/arch/mips/kernel/machine_kexec.c 2010-03-29 12:10:37.000000000 +0100 -@@ -52,7 +52,7 @@ +--- a/arch/mips/kernel/machine_kexec.c ++++ b/arch/mips/kernel/machine_kexec.c +@@ -52,7 +52,7 @@ machine_kexec(struct kimage *image) reboot_code_buffer = (unsigned long)page_address(image->control_code_page); diff --git a/target/linux/generic-2.6/patches-2.6.33/060-block2mtd_init.patch b/target/linux/generic-2.6/patches-2.6.33/060-block2mtd_init.patch index 3a47c85bb9..8feec96a19 100644 --- a/target/linux/generic-2.6/patches-2.6.33/060-block2mtd_init.patch +++ b/target/linux/generic-2.6/patches-2.6.33/060-block2mtd_init.patch @@ -110,7 +110,7 @@ { --- a/fs/partitions/check.c +++ b/fs/partitions/check.c -@@ -625,6 +625,7 @@ try_scan: +@@ -637,6 +637,7 @@ try_scan: kfree(state); return 0; } diff --git a/target/linux/generic-2.6/patches-2.6.33/150-netfilter_imq.patch b/target/linux/generic-2.6/patches-2.6.33/150-netfilter_imq.patch index 510ce70425..28b3ad3aef 100644 --- a/target/linux/generic-2.6/patches-2.6.33/150-netfilter_imq.patch +++ b/target/linux/generic-2.6/patches-2.6.33/150-netfilter_imq.patch @@ -851,17 +851,18 @@ /* Don't change this without changing skb_csum_unnecessary! */ #define CHECKSUM_NONE 0 -@@ -327,6 +330,9 @@ - * first. This is owned by whoever has the skb queued ATM. - */ - char cb[48] __aligned(8); -+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) -+ void *cb_next; -+#endif +@@ -320,6 +323,10 @@ struct sk_buff { + struct net_device *dev; unsigned long _skb_dst; ++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) ++ void *cb_next; ++#endif ++ #ifdef CONFIG_XFRM -@@ -363,6 +369,9 @@ + struct sec_path *sp; + #endif +@@ -362,6 +369,9 @@ struct sk_buff { struct nf_conntrack *nfct; struct sk_buff *nfct_reasm; #endif @@ -871,7 +872,7 @@ #ifdef CONFIG_BRIDGE_NETFILTER struct nf_bridge_info *nf_bridge; #endif -@@ -384,6 +393,10 @@ +@@ -383,6 +393,10 @@ struct sk_buff { /* 0/14 bit hole */ @@ -882,7 +883,7 @@ #ifdef CONFIG_NET_DMA dma_cookie_t dma_cookie; #endif -@@ -432,6 +445,12 @@ +@@ -431,6 +445,12 @@ static inline struct rtable *skb_rtable( return (struct rtable *)skb_dst(skb); } @@ -895,7 +896,7 @@ extern void kfree_skb(struct sk_buff *skb); extern void consume_skb(struct sk_buff *skb); extern void __kfree_skb(struct sk_buff *skb); -@@ -1976,6 +1995,10 @@ +@@ -1975,6 +1995,10 @@ static inline void __nf_copy(struct sk_b dst->nfct_reasm = src->nfct_reasm; nf_conntrack_get_reasm(src->nfct_reasm); #endif diff --git a/target/linux/generic-2.6/patches-2.6.33/205-skb_padding.patch b/target/linux/generic-2.6/patches-2.6.33/205-skb_padding.patch index 6e6d28b770..bee41a4a63 100644 --- a/target/linux/generic-2.6/patches-2.6.33/205-skb_padding.patch +++ b/target/linux/generic-2.6/patches-2.6.33/205-skb_padding.patch @@ -1,6 +1,6 @@ --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h -@@ -1377,11 +1377,18 @@ static inline int skb_network_offset(con +@@ -1378,11 +1378,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) -@@ -1471,9 +1478,9 @@ static inline void __skb_queue_purge(str +@@ -1472,9 +1479,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; } -@@ -1556,7 +1563,7 @@ static inline int __skb_cow(struct sk_bu +@@ -1557,7 +1564,7 @@ static inline int __skb_cow(struct sk_bu delta = headroom - skb_headroom(skb); if (delta || cloned) diff --git a/target/linux/generic-2.6/patches-2.6.33/940-wireless_mesh_header.patch b/target/linux/generic-2.6/patches-2.6.33/940-wireless_mesh_header.patch index a2b82d86ad..421ed8b020 100644 --- a/target/linux/generic-2.6/patches-2.6.33/940-wireless_mesh_header.patch +++ b/target/linux/generic-2.6/patches-2.6.33/940-wireless_mesh_header.patch @@ -1,9 +1,9 @@ --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h -@@ -137,7 +137,7 @@ +@@ -137,7 +137,7 @@ static inline bool dev_xmit_complete(int */ - #if defined(CONFIG_WLAN) || defined(CONFIG_AX25) || defined(CONFIG_AX25_MODULE) + #if defined(CONFIG_WLAN_80211) || defined(CONFIG_AX25) || defined(CONFIG_AX25_MODULE) -# if defined(CONFIG_MAC80211_MESH) +# if 1 || defined(CONFIG_MAC80211_MESH) # define LL_MAX_HEADER 128 |