aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6/patches-2.6.28/150-netfilter_imq.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2009-03-19 13:05:05 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2009-03-19 13:05:05 +0000
commitdfd7233c8bae9cc1c5524e94fac6b3c72ac04adf (patch)
tree9e927c81620b6547bc74e0df803007d245c2c4fd /target/linux/generic-2.6/patches-2.6.28/150-netfilter_imq.patch
parent76fe41a8d3337c5f1c6753541cc19fa06af036ed (diff)
downloadupstream-dfd7233c8bae9cc1c5524e94fac6b3c72ac04adf.tar.gz
upstream-dfd7233c8bae9cc1c5524e94fac6b3c72ac04adf.tar.bz2
upstream-dfd7233c8bae9cc1c5524e94fac6b3c72ac04adf.zip
resync kernel patches
SVN-Revision: 14949
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.28/150-netfilter_imq.patch')
-rw-r--r--target/linux/generic-2.6/patches-2.6.28/150-netfilter_imq.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.28/150-netfilter_imq.patch b/target/linux/generic-2.6/patches-2.6.28/150-netfilter_imq.patch
index d3e65f78b2..310d0fc966 100644
--- a/target/linux/generic-2.6/patches-2.6.28/150-netfilter_imq.patch
+++ b/target/linux/generic-2.6/patches-2.6.28/150-netfilter_imq.patch
@@ -664,7 +664,7 @@
#ifdef CONFIG_BRIDGE_NETFILTER
struct nf_bridge_info *nf_bridge;
#endif
-@@ -1813,6 +1817,10 @@ static inline void __nf_copy(struct sk_b
+@@ -1804,6 +1808,10 @@ static inline void __nf_copy(struct sk_b
dst->nfct_reasm = src->nfct_reasm;
nf_conntrack_get_reasm(src->nfct_reasm);
#endif