From 970c3ca133d4c5164819c0d64458540fa69aaf9e Mon Sep 17 00:00:00 2001 From: Jozsef Kadlecsik Date: Wed, 1 Jun 2011 23:35:48 +0200 Subject: [PATCH] --- yaml --- r: 253387 b: refs/heads/master c: fcbf12817100d23890832801507107718a1fa448 h: refs/heads/master i: 253385: 90964eff9cd71579fd52947d5e7d4aa971f36a18 253383: 15167560634730a96a167cb876baf4c3543fbe61 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 6c9ab1d53dca..88dd1ab8f576 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: afb523c54718da57ff661950bd3287ec9eeb66bd +refs/heads/master: fcbf12817100d23890832801507107718a1fa448 diff --git a/trunk/net/netfilter/ipset/ip_set_core.c b/trunk/net/netfilter/ipset/ip_set_core.c index 8041befc6555..42aa64b6b0b1 100644 --- a/trunk/net/netfilter/ipset/ip_set_core.c +++ b/trunk/net/netfilter/ipset/ip_set_core.c @@ -767,7 +767,7 @@ ip_set_destroy(struct sock *ctnl, struct sk_buff *skb, if (!attr[IPSET_ATTR_SETNAME]) { for (i = 0; i < ip_set_max; i++) { if (ip_set_list[i] != NULL && ip_set_list[i]->ref) { - ret = IPSET_ERR_BUSY; + ret = -IPSET_ERR_BUSY; goto out; } }