OSDN Git Service
(root)
/
tomoyo
/
tomoyo-test1.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b66554c
)
netfilter: ipset: fix return code for destroy when sets are in use
author
Jozsef Kadlecsik
<kadlec@blackhole.kfki.hu>
Thu, 16 Jun 2011 16:57:44 +0000
(18:57 +0200)
committer
Patrick McHardy
<kaber@trash.net>
Thu, 16 Jun 2011 16:57:44 +0000
(18:57 +0200)
Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Signed-off-by: Patrick McHardy <kaber@trash.net>
net/netfilter/ipset/ip_set_core.c
patch
|
blob
|
history
diff --git
a/net/netfilter/ipset/ip_set_core.c
b/net/netfilter/ipset/ip_set_core.c
index
64e7b04
..
80a1262
100644
(file)
--- a/
net/netfilter/ipset/ip_set_core.c
+++ b/
net/netfilter/ipset/ip_set_core.c
@@
-776,7
+776,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;
}
}