From: Waldemar Brodkorb Date: Thu, 15 Dec 2005 23:15:50 +0000 (+0000) Subject: fix one of the iptables 1.3.4 compile errors on 2.4 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=6070f77c0f66190c25f711e4361348d7741f0e03;p=librecmc%2Flibrecmc.git fix one of the iptables 1.3.4 compile errors on 2.4 SVN-Revision: 2691 --- diff --git a/openwrt/target/linux/linux-2.4/patches/generic/610-netfilter_connbytes.patch b/openwrt/target/linux/linux-2.4/patches/generic/610-netfilter_connbytes.patch index f6f84d320b..d9761171c6 100644 --- a/openwrt/target/linux/linux-2.4/patches/generic/610-netfilter_connbytes.patch +++ b/openwrt/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 {