diff options
| author | Willem de Bruijn <willemb@google.com> | 2018-07-06 10:12:57 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-07-07 10:58:49 +0900 |
| commit | 5fdaa88dfefa87ee1ea92750e99950dca182ea41 (patch) | |
| tree | 394116bee42930622ead18315567df8b0e472c09 /net/ipv6/datagram.c | |
| parent | 657a0667025e77cc17f8a38b93e60a2bc24d830c (diff) | |
| download | linux-5fdaa88dfefa87ee1ea92750e99950dca182ea41.tar.gz | |
ipv6: fold sockcm_cookie into ipcm6_cookie
ipcm_cookie includes sockcm_cookie. Do the same for ipcm6_cookie.
This reduces the number of arguments that need to be passed around,
applies ipcm6_init to all cookie fields at once and reduces code
differentiation between ipv4 and ipv6.
Signed-off-by: Willem de Bruijn <willemb@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/datagram.c')
| -rw-r--r-- | net/ipv6/datagram.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/datagram.c b/net/ipv6/datagram.c index 2ee08b6a86a48..201306b9b5ea0 100644 --- a/net/ipv6/datagram.c +++ b/net/ipv6/datagram.c @@ -736,7 +736,7 @@ EXPORT_SYMBOL_GPL(ip6_datagram_recv_ctl); int ip6_datagram_send_ctl(struct net *net, struct sock *sk, struct msghdr *msg, struct flowi6 *fl6, - struct ipcm6_cookie *ipc6, struct sockcm_cookie *sockc) + struct ipcm6_cookie *ipc6) { struct in6_pktinfo *src_info; struct cmsghdr *cmsg; @@ -755,7 +755,7 @@ int ip6_datagram_send_ctl(struct net *net, struct sock *sk, } if (cmsg->cmsg_level == SOL_SOCKET) { - err = __sock_cmsg_send(sk, msg, cmsg, sockc); + err = __sock_cmsg_send(sk, msg, cmsg, &ipc6->sockc); if (err) return err; continue; |