projects
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
90c4656
)
[NETFILTER]: ctnetlink: propagate ctnetlink_dump_tuples_proto return value back
author
Pablo Neira Ayuso
<pablo@netfilter.org>
Thu, 5 Jan 2006 20:17:29 +0000
(12:17 -0800)
committer
David S. Miller
<davem@davemloft.net>
Thu, 5 Jan 2006 20:17:29 +0000
(12:17 -0800)
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv4/netfilter/ip_conntrack_netlink.c
patch
|
blob
|
history
diff --git
a/net/ipv4/netfilter/ip_conntrack_netlink.c
b/net/ipv4/netfilter/ip_conntrack_netlink.c
index 91fe8f2e38ffe500a2f72c6b3c6f69c3a7e548c6..5e9affdd0dbee926ee0f00c31f80219193ef0aba 100644
(file)
--- a/
net/ipv4/netfilter/ip_conntrack_netlink.c
+++ b/
net/ipv4/netfilter/ip_conntrack_netlink.c
@@
-79,6
+79,7
@@
ctnetlink_dump_tuples(struct sk_buff *skb,
const struct ip_conntrack_tuple *tuple)
{
struct nfattr *nest_parms;
+ int ret;
nest_parms = NFA_NEST(skb, CTA_TUPLE_IP);
NFA_PUT(skb, CTA_IP_V4_SRC, sizeof(u_int32_t), &tuple->src.ip);
@@
-86,10
+87,10
@@
ctnetlink_dump_tuples(struct sk_buff *skb,
NFA_NEST_END(skb, nest_parms);
nest_parms = NFA_NEST(skb, CTA_TUPLE_PROTO);
- ctnetlink_dump_tuples_proto(skb, tuple);
+
ret =
ctnetlink_dump_tuples_proto(skb, tuple);
NFA_NEST_END(skb, nest_parms);
- return
0
;
+ return
ret
;
nfattr_failure:
return -1;