From 1399313fec222af3f62ca9777ec4680f11845eee Mon Sep 17 00:00:00 2001 From: Jozsef Kadlecsik Date: Thu, 21 Feb 2013 11:12:40 +0100 Subject: [PATCH] --- yaml --- r: 360769 b: refs/heads/master c: dd82088dab3646ed28e4aa43d1a5b5d5ffc2afba h: refs/heads/master i: 360767: cd9e66b0d46e0deb1948735989bf188bbdf7fd63 v: v3 --- [refs] | 2 +- trunk/net/netfilter/ipset/ip_set_core.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 85053349c013..5900ee3590f9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cf1c4a094f46ace5bf00078e2db73491ddf018fe +refs/heads/master: dd82088dab3646ed28e4aa43d1a5b5d5ffc2afba diff --git a/trunk/net/netfilter/ipset/ip_set_core.c b/trunk/net/netfilter/ipset/ip_set_core.c index 6d6d8f2b033e..38ca630eeeb8 100644 --- a/trunk/net/netfilter/ipset/ip_set_core.c +++ b/trunk/net/netfilter/ipset/ip_set_core.c @@ -1470,7 +1470,8 @@ ip_set_utest(struct sock *ctnl, struct sk_buff *skb, if (ret == -EAGAIN) ret = 1; - return ret < 0 ? ret : ret > 0 ? 0 : -IPSET_ERR_EXIST; + return (ret < 0 && ret != -ENOTEMPTY) ? ret : + ret > 0 ? 0 : -IPSET_ERR_EXIST; } /* Get headed data of a set */