summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Bowler <jbowler@nslu2-linux.org>2005-09-25 21:45:37 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2005-09-25 21:45:37 +0000
commit6c8f3f3245ea196ea280e01c94c45274a5bdda59 (patch)
tree1006cea037b305fc113facdaa6ba38b0fd8822d2
parent2bcaf555c8cee084ccb1e2f6f2676b880a0ed0ef (diff)
ixp425-eth: extra patch for 2.6.14+ kernels with netfilter
-rw-r--r--packages/ixp425-eth/files/2.6.14.patch12
1 files changed, 12 insertions, 0 deletions
diff --git a/packages/ixp425-eth/files/2.6.14.patch b/packages/ixp425-eth/files/2.6.14.patch
index c86ff971ed..e93edb6e9b 100644
--- a/packages/ixp425-eth/files/2.6.14.patch
+++ b/packages/ixp425-eth/files/2.6.14.patch
@@ -1,6 +1,18 @@
# change in field semantic in 2.6.14
--- dir/ixp425_eth.c 2005-09-24 17:50:57.828607113 -0700
+++ dir/ixp425_eth.c 2005-09-24 17:54:19.593303365 -0700
+@@ -668,7 +668,11 @@
+ * reset the following fields in the skbuff before re-using it on the Rx-path
+ */
+ #ifdef CONFIG_NETFILTER
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,14)
+ skb->nfmark = skb->nfcache = 0;
++#else
++ skb->nfmark = 0;
++#endif
+ nf_conntrack_put(skb->nfct);
+ skb->nfct = NULL;
+ #ifdef CONFIG_NETFILTER_DEBUG
@@ -1300,8 +1300,12 @@
skb->len -= header_len;