summaryrefslogtreecommitdiff
path: root/target/linux/linux-2.4
diff options
context:
space:
mode:
authorwbx <wbx@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-12-15 23:15:50 +0000
committerwbx <wbx@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-12-15 23:15:50 +0000
commit38c30280bce850d62eb71c1342bfe488c1b38958 (patch)
treeefac36bb95a6abf717b2cb72632f892f1ab1359d /target/linux/linux-2.4
parenta18b033cc9cb6e41ad33c1ad395f6f77fe043e58 (diff)
fix one of the iptables 1.3.4 compile errors on 2.4
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2691 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/linux-2.4')
-rw-r--r--target/linux/linux-2.4/patches/generic/610-netfilter_connbytes.patch18
1 files changed, 9 insertions, 9 deletions
diff --git a/target/linux/linux-2.4/patches/generic/610-netfilter_connbytes.patch b/target/linux/linux-2.4/patches/generic/610-netfilter_connbytes.patch
index f6f84d320b..d9761171c6 100644
--- a/target/linux/linux-2.4/patches/generic/610-netfilter_connbytes.patch
+++ b/target/linux/linux-2.4/patches/generic/610-netfilter_connbytes.patch
@@ -271,7 +271,7 @@
+ if (!(ct = ip_conntrack_get((struct sk_buff *)skb, &ctinfo)))
+ return 0; /* no match */
+ switch (sinfo->what) {
-+ case IPT_CONNBYTES_WHAT_PKTS:
++ case IPT_CONNBYTES_PKTS:
+ switch (sinfo->direction) {
+ case IPT_CONNBYTES_DIR_ORIGINAL:
+ what = ct->counters[IP_CT_DIR_ORIGINAL].packets;
@@ -285,7 +285,7 @@
+ break;
+ }
+ break;
-+ case IPT_CONNBYTES_WHAT_BYTES:
++ case IPT_CONNBYTES_BYTES:
+ switch (sinfo->direction) {
+ case IPT_CONNBYTES_DIR_ORIGINAL:
+ what = ct->counters[IP_CT_DIR_ORIGINAL].bytes;
@@ -299,7 +299,7 @@
+ break;
+ }
+ break;
-+ case IPT_CONNBYTES_WHAT_AVGPKT:
++ case IPT_CONNBYTES_AVGPKT:
+ switch (sinfo->direction) {
+ case IPT_CONNBYTES_DIR_ORIGINAL:
+ {
@@ -358,9 +358,9 @@
+
+ if (matchsize != IPT_ALIGN(sizeof(struct ipt_connbytes_info)))
+ return 0;
-+ if (sinfo->what != IPT_CONNBYTES_WHAT_PKTS &&
-+ sinfo->what != IPT_CONNBYTES_WHAT_BYTES &&
-+ sinfo->what != IPT_CONNBYTES_WHAT_AVGPKT)
++ if (sinfo->what != IPT_CONNBYTES_PKTS &&
++ sinfo->what != IPT_CONNBYTES_BYTES &&
++ sinfo->what != IPT_CONNBYTES_AVGPKT)
+ return 0;
+
+ if (sinfo->direction != IPT_CONNBYTES_DIR_ORIGINAL &&
@@ -393,9 +393,9 @@
+#ifndef _IPT_CONNBYTES_H
+#define _IPT_CONNBYTES_H
+enum ipt_connbytes_what {
-+ IPT_CONNBYTES_WHAT_PKTS,
-+ IPT_CONNBYTES_WHAT_BYTES,
-+ IPT_CONNBYTES_WHAT_AVGPKT,
++ IPT_CONNBYTES_PKTS,
++ IPT_CONNBYTES_BYTES,
++ IPT_CONNBYTES_AVGPKT,
+};
+
+enum ipt_connbytes_direction {