diff options
Diffstat (limited to 'net/l2tp')
-rw-r--r-- | net/l2tp/l2tp_netlink.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/net/l2tp/l2tp_netlink.c b/net/l2tp/l2tp_netlink.c index 6b16598f31d5..b4e923f77954 100644 --- a/net/l2tp/l2tp_netlink.c +++ b/net/l2tp/l2tp_netlink.c | |||
@@ -390,7 +390,8 @@ static int l2tp_nl_tunnel_send(struct sk_buff *skb, u32 portid, u32 seq, int fla | |||
390 | } | 390 | } |
391 | 391 | ||
392 | out: | 392 | out: |
393 | return genlmsg_end(skb, hdr); | 393 | genlmsg_end(skb, hdr); |
394 | return 0; | ||
394 | 395 | ||
395 | nla_put_failure: | 396 | nla_put_failure: |
396 | genlmsg_cancel(skb, hdr); | 397 | genlmsg_cancel(skb, hdr); |
@@ -451,7 +452,7 @@ static int l2tp_nl_cmd_tunnel_dump(struct sk_buff *skb, struct netlink_callback | |||
451 | 452 | ||
452 | if (l2tp_nl_tunnel_send(skb, NETLINK_CB(cb->skb).portid, | 453 | if (l2tp_nl_tunnel_send(skb, NETLINK_CB(cb->skb).portid, |
453 | cb->nlh->nlmsg_seq, NLM_F_MULTI, | 454 | cb->nlh->nlmsg_seq, NLM_F_MULTI, |
454 | tunnel, L2TP_CMD_TUNNEL_GET) <= 0) | 455 | tunnel, L2TP_CMD_TUNNEL_GET) < 0) |
455 | goto out; | 456 | goto out; |
456 | 457 | ||
457 | ti++; | 458 | ti++; |
@@ -752,7 +753,8 @@ static int l2tp_nl_session_send(struct sk_buff *skb, u32 portid, u32 seq, int fl | |||
752 | goto nla_put_failure; | 753 | goto nla_put_failure; |
753 | nla_nest_end(skb, nest); | 754 | nla_nest_end(skb, nest); |
754 | 755 | ||
755 | return genlmsg_end(skb, hdr); | 756 | genlmsg_end(skb, hdr); |
757 | return 0; | ||
756 | 758 | ||
757 | nla_put_failure: | 759 | nla_put_failure: |
758 | genlmsg_cancel(skb, hdr); | 760 | genlmsg_cancel(skb, hdr); |
@@ -816,7 +818,7 @@ static int l2tp_nl_cmd_session_dump(struct sk_buff *skb, struct netlink_callback | |||
816 | 818 | ||
817 | if (l2tp_nl_session_send(skb, NETLINK_CB(cb->skb).portid, | 819 | if (l2tp_nl_session_send(skb, NETLINK_CB(cb->skb).portid, |
818 | cb->nlh->nlmsg_seq, NLM_F_MULTI, | 820 | cb->nlh->nlmsg_seq, NLM_F_MULTI, |
819 | session, L2TP_CMD_SESSION_GET) <= 0) | 821 | session, L2TP_CMD_SESSION_GET) < 0) |
820 | break; | 822 | break; |
821 | 823 | ||
822 | si++; | 824 | si++; |