Merge branch 'for-3.20/core' of git://git.kernel.dk/linux-block

[cascardo/linux.git] / net / packet / diag.c

diff --git a/net/packet/diag.c b/net/packet/diag.c
index 92f2c71..0ed68f0 100644 (file)
--- a/net/packet/diag.c
+++ b/net/packet/diag.c
@@ -177,7 +177,8 @@ static int sk_diag_fill(struct sock *sk, struct sk_buff *skb,
                                     PACKET_DIAG_FILTER))
                goto out_nlmsg_trim;
 
-       return nlmsg_end(skb, nlh);
+       nlmsg_end(skb, nlh);
+       return 0;
 
 out_nlmsg_trim:
        nlmsg_cancel(skb, nlh);