arm64: cpuinfo: add system serial support

[firefly-linux-kernel-4.4.55.git] / net / packet / diag.c

diff --git a/net/packet/diag.c b/net/packet/diag.c
index 674b0a65df6c02eb49d36869c969a1439982ab2e..0ed68f0238bf9416f1cc92928b61a385a1055886 100644 (file)
--- a/net/packet/diag.c
+++ b/net/packet/diag.c
@@ -3,6 +3,7 @@
 #include <linux/net.h>
 #include <linux/netdevice.h>
 #include <linux/packet_diag.h>
+#include <linux/percpu.h>
 #include <net/net_namespace.h>
 #include <net/sock.h>
 
@@ -176,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);