Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf

[linux-2.6-block.git] / net / netfilter / ipvs / ip_vs_ctl.c

diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c
index fdcda8be1f0f8fcb3bd0325aa89e0bb8599c9893..ed99448671c3003374fc947bee6e91ab0f0d3fce 100644 (file)
--- a/net/netfilter/ipvs/ip_vs_ctl.c
+++ b/net/netfilter/ipvs/ip_vs_ctl.c
@@ -2887,7 +2887,8 @@ static int ip_vs_genl_dump_service(struct sk_buff *skb,
        if (ip_vs_genl_fill_service(skb, svc) < 0)
                goto nla_put_failure;
 
-       return genlmsg_end(skb, hdr);
+       genlmsg_end(skb, hdr);
+       return 0;
 
 nla_put_failure:
        genlmsg_cancel(skb, hdr);
@@ -3079,7 +3080,8 @@ static int ip_vs_genl_dump_dest(struct sk_buff *skb, struct ip_vs_dest *dest,
        if (ip_vs_genl_fill_dest(skb, dest) < 0)
                goto nla_put_failure;
 
-       return genlmsg_end(skb, hdr);
+       genlmsg_end(skb, hdr);
+       return 0;
 
 nla_put_failure:
        genlmsg_cancel(skb, hdr);
@@ -3215,7 +3217,8 @@ static int ip_vs_genl_dump_daemon(struct sk_buff *skb, __u32 state,
        if (ip_vs_genl_fill_daemon(skb, state, mcast_ifn, syncid))
                goto nla_put_failure;
 
-       return genlmsg_end(skb, hdr);
+       genlmsg_end(skb, hdr);
+       return 0;
 
 nla_put_failure:
        genlmsg_cancel(skb, hdr);