From 6ec7c20ad503d57001e5cffbcaaa90f954bf95dc Mon Sep 17 00:00:00 2001 From: Jozsef Kadlecsik Date: Tue, 24 May 2011 10:20:19 +0200 Subject: [PATCH] --- yaml --- r: 252274 b: refs/heads/master c: 9184a9cba622d9e38462ce11dff7da094b4fea84 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/netfilter/ipset/ip_set_core.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 940bcd575074..25d0c948068c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b141c242ff978b63cdf0f3d1a767a5152750166b +refs/heads/master: 9184a9cba622d9e38462ce11dff7da094b4fea84 diff --git a/trunk/net/netfilter/ipset/ip_set_core.c b/trunk/net/netfilter/ipset/ip_set_core.c index 72d1ac611fdc..8041befc6555 100644 --- a/trunk/net/netfilter/ipset/ip_set_core.c +++ b/trunk/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++)