aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-12-23 14:29:20 -0500
committerDavid S. Miller <davem@davemloft.net>2011-12-23 14:29:20 -0500
commit6350323ad8def2ac00d77cdee3b79c9b9fba75c4 (patch)
tree299b12c2335e9bf59b3e35c0eb098c1734ba92e1
parent0fd7bac6b6157eed6cf0cb86a1e88ba29e57c033 (diff)
parent0354b48f633ae435acbc01b470a1ce8cfeff3e9f (diff)
downloadlinux-linaro-6350323ad8def2ac00d77cdee3b79c9b9fba75c4.tar.gz
Merge branch 'nf' of git://1984.lsi.us.es/net
-rw-r--r--net/netfilter/xt_connbytes.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/netfilter/xt_connbytes.c b/net/netfilter/xt_connbytes.c
index 5b13850..9ddf1c3 100644
--- a/net/netfilter/xt_connbytes.c
+++ b/net/netfilter/xt_connbytes.c
@@ -87,10 +87,10 @@ connbytes_mt(const struct sk_buff *skb, struct xt_action_param *par)
break;
}
- if (sinfo->count.to)
+ if (sinfo->count.to >= sinfo->count.from)
return what <= sinfo->count.to && what >= sinfo->count.from;
- else
- return what >= sinfo->count.from;
+ else /* inverted */
+ return what < sinfo->count.to || what > sinfo->count.from;
}
static int connbytes_mt_check(const struct xt_mtchk_param *par)