diff options
| author | yuan linyu <Linyu.Yuan@alcatel-sbell.com.cn> | 2017-01-03 20:42:17 +0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-01-04 13:04:37 -0500 |
| commit | 1ff8cebf49ed9e9ca2ae44b5c4176aef9c21af9c (patch) | |
| tree | 0f0a0657be00abd5c252ebe5ce59a4dca04a3345 /net/ipv4 | |
| parent | ec2507d2a3060a970fa314556891828cfd60093e (diff) | |
| download | linux-1ff8cebf49ed9e9ca2ae44b5c4176aef9c21af9c.tar.bz2 | |
scm: remove use CMSG{_COMPAT}_ALIGN(sizeof(struct {compat_}cmsghdr))
sizeof(struct cmsghdr) and sizeof(struct compat_cmsghdr) already aligned.
remove use CMSG_ALIGN(sizeof(struct cmsghdr)) and
CMSG_COMPAT_ALIGN(sizeof(struct compat_cmsghdr)) keep code consistent.
Signed-off-by: yuan linyu <Linyu.Yuan@alcatel-sbell.com.cn>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
| -rw-r--r-- | net/ipv4/ip_sockglue.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c index cf9b43de4690..1caa38d8a9c9 100644 --- a/net/ipv4/ip_sockglue.c +++ b/net/ipv4/ip_sockglue.c @@ -272,7 +272,7 @@ int ip_cmsg_send(struct sock *sk, struct msghdr *msg, struct ipcm_cookie *ipc, continue; switch (cmsg->cmsg_type) { case IP_RETOPTS: - err = cmsg->cmsg_len - CMSG_ALIGN(sizeof(struct cmsghdr)); + err = cmsg->cmsg_len - sizeof(struct cmsghdr); /* Our caller is responsible for freeing ipc->opt */ err = ip_options_get(net, &ipc->opt, CMSG_DATA(cmsg), |