---

yaml --- r: 360769 b: refs/heads/master c: dd82088 h: refs/heads/master i: 360767: cd9e66b v: v3
git-mirror · Feb 21, 2013 · 1399313 · 1399313
1 parent bb90062
commit 1399313
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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 */