projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
[linux-2.6-microblaze.git]
/
net
/
rxrpc
/
sendmsg.c
diff --git
a/net/rxrpc/sendmsg.c
b/net/rxrpc/sendmsg.c
index
b214a4d
..
0a6ef21
100644
(file)
--- a/
net/rxrpc/sendmsg.c
+++ b/
net/rxrpc/sendmsg.c
@@
-376,7
+376,7
@@
static int rxrpc_sendmsg_cmsg(struct msghdr *msg,
if (!CMSG_OK(msg, cmsg))
return -EINVAL;
- len = cmsg->cmsg_len -
CMSG_ALIGN(sizeof(struct cmsghdr)
);
+ len = cmsg->cmsg_len -
sizeof(struct cmsghdr
);
_debug("CMSG %d, %d, %d",
cmsg->cmsg_level, cmsg->cmsg_type, len);