diff options
author | Florian Fainelli <florian@openwrt.org> | 2010-04-09 19:26:57 +0000 |
---|---|---|
committer | Florian Fainelli <florian@openwrt.org> | 2010-04-09 19:26:57 +0000 |
commit | 668769edf76315ebb86087705e3246b585e823ca (patch) | |
tree | 0966ff42f6c8406486ba415fe96a956359b14453 /target/linux/generic-2.6/patches-2.6.33/150-netfilter_imq.patch | |
parent | 393df13165b1071c98c120d1b22d19426c2a16d4 (diff) | |
download | master-187ad058-668769edf76315ebb86087705e3246b585e823ca.tar.gz master-187ad058-668769edf76315ebb86087705e3246b585e823ca.tar.bz2 master-187ad058-668769edf76315ebb86087705e3246b585e823ca.zip |
[kernel] refresh patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20767 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.33/150-netfilter_imq.patch')
-rw-r--r-- | target/linux/generic-2.6/patches-2.6.33/150-netfilter_imq.patch | 23 |
1 files changed, 12 insertions, 11 deletions
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 |