OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
464a3e3
)
netfilter: ipset: fix ip_set_flush return code
author
Jozsef Kadlecsik
<kadlec@blackhole.kfki.hu>
Tue, 24 May 2011 08:20:19 +0000
(10:20 +0200)
committer
Greg Kroah-Hartman
<gregkh@suse.de>
Sat, 9 Jul 2011 06:14:51 +0000
(23:14 -0700)
[ 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
patch
|
blob
|
history
diff --git
a/net/netfilter/ipset/ip_set_core.c
b/net/netfilter/ipset/ip_set_core.c
index
72d1ac6
..
8041bef
100644
(file)
--- 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 sk_buff *skb,
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++)