Messages in this thread Patch in this message | | | Date | Thu, 07 Jul 2011 17:15:36 -0700 | From | Greg KH <> | Subject | [004/107] netfilter: ipset: fix ip_set_flush return code |
| |
2.6.39-stable review patch. If anyone has any objections, please let us know.
------------------
From: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
[ 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> --- net/netfilter/ipset/ip_set_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
--- 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 s 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++)
| |