projects/linux·commit 6350323a

Merge branch 'nf' of git://1984.lsi.us.es/net

6350323a · David S. Miller <[email protected]> · 2011-12-23 14:29:20 -05:00

Commit
6350323ad8def2ac00d77cdee3b79c9b9fba75c4
Parents
0fd7bac6 · 0354b48f

Merge commit. Changes below are compared with the first parent: 0fd7bac6.

Changes

1 files changed · +3 −3

FileStatusAddDelContent
net/netfilter/xt_connbytes.cmodified+3−3View file

net/netfilter/xt_connbytes.c

View file
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)