qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-24 03:58:35 +02:00
Code

generic-2.6: sync patches to 2.6.33.1

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20236 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
acoul 2010-03-16 08:15:47 +00:00
parent 99cbbb372c
commit 27b61d4598
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
target/linux/generic-2.6/patches-2.6.33/150-netfilter_imq.patch
View File

@ -851,17 +851,17 @@
/* Don't change this without changing skb_csum_unnecessary! */ /* Don't change this without changing skb_csum_unnecessary! */
#define CHECKSUM_NONE 0 #define CHECKSUM_NONE 0
@@ -330,6 +333,9 @@ struct sk_buff { @@ -327,6 +330,9 @@
* first. This is owned by whoever has the skb queued ATM. * first. This is owned by whoever has the skb queued ATM.
*/ */
char cb[48]; char cb[48] __aligned(8);
+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) +#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
+ void *cb_next; + void *cb_next;
+#endif +#endif
unsigned int len, unsigned long _skb_dst;
data_len; #ifdef CONFIG_XFRM
@@ -362,6 +368,9 @@ struct sk_buff { @@ -363,6 +369,9 @@
struct nf_conntrack *nfct; struct nf_conntrack *nfct;
struct sk_buff *nfct_reasm; struct sk_buff *nfct_reasm;
#endif #endif
@ -871,7 +871,7 @@
#ifdef CONFIG_BRIDGE_NETFILTER #ifdef CONFIG_BRIDGE_NETFILTER
struct nf_bridge_info *nf_bridge; struct nf_bridge_info *nf_bridge;
#endif #endif
@@ -383,6 +392,10 @@ struct sk_buff { @@ -384,6 +393,10 @@
/* 0/14 bit hole */ /* 0/14 bit hole */
@ -882,7 +882,7 @@
#ifdef CONFIG_NET_DMA #ifdef CONFIG_NET_DMA
dma_cookie_t dma_cookie; dma_cookie_t dma_cookie;
#endif #endif
@@ -431,6 +444,12 @@ static inline struct rtable *skb_rtable( @@ -432,6 +445,12 @@
return (struct rtable *)skb_dst(skb); return (struct rtable *)skb_dst(skb);
} }
@ -895,7 +895,7 @@
extern void kfree_skb(struct sk_buff *skb); extern void kfree_skb(struct sk_buff *skb);
extern void consume_skb(struct sk_buff *skb); extern void consume_skb(struct sk_buff *skb);
extern void __kfree_skb(struct sk_buff *skb); extern void __kfree_skb(struct sk_buff *skb);
@@ -1975,6 +1994,10 @@ static inline void __nf_copy(struct sk_b @@ -1976,6 +1995,10 @@
dst->nfct_reasm = src->nfct_reasm; dst->nfct_reasm = src->nfct_reasm;
nf_conntrack_get_reasm(src->nfct_reasm); nf_conntrack_get_reasm(src->nfct_reasm);
#endif #endif

4
target/linux/generic-2.6/patches-2.6.33/940-wireless_mesh_header.patch
View File

@ -1,9 +1,9 @@
--- a/include/linux/netdevice.h --- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h +++ b/include/linux/netdevice.h
@@ -137,7 +137,7 @@ static inline bool dev_xmit_complete(int @@ -137,7 +137,7 @@
*/ */
#if defined(CONFIG_WLAN_80211) || defined(CONFIG_AX25) || defined(CONFIG_AX25_MODULE) #if defined(CONFIG_WLAN) || defined(CONFIG_AX25) || defined(CONFIG_AX25_MODULE)
-# if defined(CONFIG_MAC80211_MESH) -# if defined(CONFIG_MAC80211_MESH)
+# if 1 || defined(CONFIG_MAC80211_MESH) +# if 1 || defined(CONFIG_MAC80211_MESH)
# define LL_MAX_HEADER 128 # define LL_MAX_HEADER 128