aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJozsef Kadlecsik <kadlec@blackhole.kfki.hu>2011-05-24 10:20:19 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2011-07-08 23:14:51 -0700
commit32f8181903197a374e0f1c35ca27eb91bedef27e (patch)
treedd5b79d79b743e77ccea6ed6e02c082362a64cb0
parent464a3e3890273dfdfcd6a2a1054c32d49c0fb366 (diff)
downloadfor-greg-32f8181903197a374e0f1c35ca27eb91bedef27e.tar.gz
netfilter: ipset: fix ip_set_flush return code
[ Upstream commit 9184a9cba622d9e38462ce11dff7da094b4fea84 ] ip_set_flush returned -EPROTO instead of -IPSET_ERR_PROTOCOL, fixed Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--net/netfilter/ipset/ip_set_core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netfilter/ipset/ip_set_core.c b/net/netfilter/ipset/ip_set_core.c
index 72d1ac611fdc8e..8041befc655535 100644
--- a/net/netfilter/ipset/ip_set_core.c
+++ b/net/netfilter/ipset/ip_set_core.c
@@ -815,7 +815,7 @@ ip_set_flush(struct sock *ctnl, struct sk_buff *skb,
ip_set_id_t i;
if (unlikely(protocol_failed(attr)))
- return -EPROTO;
+ return -IPSET_ERR_PROTOCOL;
if (!attr[IPSET_ATTR_SETNAME]) {
for (i = 0; i < ip_set_max; i++)