Skip to content

Commit 233baf9

Browse files
xu xindavem330
authored andcommitted
net: remove useless parameter of __sock_cmsg_send
The parameter 'msg' has never been used by __sock_cmsg_send, so we can remove it safely. Reported-by: Zeal Robot <[email protected]> Signed-off-by: xu xin <[email protected]> Reviewed-by: Zhang Yunkai <[email protected]> Acked-by: Kuniyuki Iwashima <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 350749b commit 233baf9

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

include/net/sock.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1901,7 +1901,7 @@ static inline void sockcm_init(struct sockcm_cookie *sockc,
19011901
*sockc = (struct sockcm_cookie) { .tsflags = sk->sk_tsflags };
19021902
}
19031903

1904-
int __sock_cmsg_send(struct sock *sk, struct msghdr *msg, struct cmsghdr *cmsg,
1904+
int __sock_cmsg_send(struct sock *sk, struct cmsghdr *cmsg,
19051905
struct sockcm_cookie *sockc);
19061906
int sock_cmsg_send(struct sock *sk, struct msghdr *msg,
19071907
struct sockcm_cookie *sockc);

net/core/sock.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2744,7 +2744,7 @@ struct sk_buff *sock_alloc_send_pskb(struct sock *sk, unsigned long header_len,
27442744
}
27452745
EXPORT_SYMBOL(sock_alloc_send_pskb);
27462746

2747-
int __sock_cmsg_send(struct sock *sk, struct msghdr *msg, struct cmsghdr *cmsg,
2747+
int __sock_cmsg_send(struct sock *sk, struct cmsghdr *cmsg,
27482748
struct sockcm_cookie *sockc)
27492749
{
27502750
u32 tsflags;
@@ -2798,7 +2798,7 @@ int sock_cmsg_send(struct sock *sk, struct msghdr *msg,
27982798
return -EINVAL;
27992799
if (cmsg->cmsg_level != SOL_SOCKET)
28002800
continue;
2801-
ret = __sock_cmsg_send(sk, msg, cmsg, sockc);
2801+
ret = __sock_cmsg_send(sk, cmsg, sockc);
28022802
if (ret)
28032803
return ret;
28042804
}

net/ipv4/ip_sockglue.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ int ip_cmsg_send(struct sock *sk, struct msghdr *msg, struct ipcm_cookie *ipc,
267267
}
268268
#endif
269269
if (cmsg->cmsg_level == SOL_SOCKET) {
270-
err = __sock_cmsg_send(sk, msg, cmsg, &ipc->sockc);
270+
err = __sock_cmsg_send(sk, cmsg, &ipc->sockc);
271271
if (err)
272272
return err;
273273
continue;

net/ipv6/datagram.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -771,7 +771,7 @@ int ip6_datagram_send_ctl(struct net *net, struct sock *sk,
771771
}
772772

773773
if (cmsg->cmsg_level == SOL_SOCKET) {
774-
err = __sock_cmsg_send(sk, msg, cmsg, &ipc6->sockc);
774+
err = __sock_cmsg_send(sk, cmsg, &ipc6->sockc);
775775
if (err)
776776
return err;
777777
continue;

0 commit comments

Comments
 (0)