summaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6/patches-2.6.28/150-netfilter_imq.patch
diff options
context:
space:
mode:
authorhauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-03-19 13:05:05 +0000
committerhauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-03-19 13:05:05 +0000
commita7242e8d705b464feea2bb180a7edc9da9ca1c9d (patch)
tree9cff8a5f67ba535541a96620925935584f24e102 /target/linux/generic-2.6/patches-2.6.28/150-netfilter_imq.patch
parent5d840152c87296251edeb1020924e9037060a0e3 (diff)
[kernel] resync kernel patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14949 3c298f89-4303-0410-b956-a3cf2f4a3e73
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 d3e65f78b..310d0fc96 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