git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[sfrench/cifs-2.6.git]
/
net
/
packet
/
diag.c
diff --git
a/net/packet/diag.c
b/net/packet/diag.c
index 92f2c7107eec4f307cc50cdfedfb4ea2db0e59de..0ed68f0238bf9416f1cc92928b61a385a1055886 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);