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 <zealci@zte.com.cn>
Signed-off-by: xu xin <xu.xin16@zte.com.cn>
Reviewed-by: Zhang Yunkai <zhang.yunkai@zte.com.cn>
Acked-by: Kuniyuki Iwashima <kuniyu@amazon.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/sock.h b/include/net/sock.h
index 9e464f6409a7175cef5f8ec22e70cade19df5e60..b1dacc4d68c9f0b27f1d3c29c27138e67288bdde 100644 (file)
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -1901,7 +1901,7 @@ static inline void sockcm_init(struct sockcm_cookie *sockc,
        *sockc = (struct sockcm_cookie) { .tsflags = sk->sk_tsflags };
 }
 
-int __sock_cmsg_send(struct sock *sk, struct msghdr *msg, struct cmsghdr *cmsg,
+int __sock_cmsg_send(struct sock *sk, struct cmsghdr *cmsg,
                     struct sockcm_cookie *sockc);
 int sock_cmsg_send(struct sock *sk, struct msghdr *msg,
                   struct sockcm_cookie *sockc);

diff --git a/net/core/sock.c b/net/core/sock.c
index aa608dc0930b51ced01af4ff59ae5430da84dd9a..2786c1107e53694ed5455a3e81a92d566bceb944 100644 (file)
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -2744,7 +2744,7 @@ failure:
 }
 EXPORT_SYMBOL(sock_alloc_send_pskb);
 
-int __sock_cmsg_send(struct sock *sk, struct msghdr *msg, struct cmsghdr *cmsg,
+int __sock_cmsg_send(struct sock *sk, struct cmsghdr *cmsg,
                     struct sockcm_cookie *sockc)
 {
        u32 tsflags;
@@ -2798,7 +2798,7 @@ int sock_cmsg_send(struct sock *sk, struct msghdr *msg,
                        return -EINVAL;
                if (cmsg->cmsg_level != SOL_SOCKET)
                        continue;
-               ret = __sock_cmsg_send(sk, msg, cmsg, sockc);
+               ret = __sock_cmsg_send(sk, cmsg, sockc);
                if (ret)
                        return ret;
        }

diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c
index 6e19cad154f5cdf7e4aecb745e0c85002d27369e..5f16807d3235b828f03864379e32c915df0d62a3 100644 (file)
--- a/net/ipv4/ip_sockglue.c
+++ b/net/ipv4/ip_sockglue.c
@@ -267,7 +267,7 @@ int ip_cmsg_send(struct sock *sk, struct msghdr *msg, struct ipcm_cookie *ipc,
                }
 #endif
                if (cmsg->cmsg_level == SOL_SOCKET) {
-                       err = __sock_cmsg_send(sk, msg, cmsg, &ipc->sockc);
+                       err = __sock_cmsg_send(sk, cmsg, &ipc->sockc);
                        if (err)
                                return err;
                        continue;

diff --git a/net/ipv6/datagram.c b/net/ipv6/datagram.c
index 5ecb56522f9d61796bf1577c41475e3f1d74444d..df7e032ce87d82f5eea6255e9239692ec89e8b22 100644 (file)
--- a/net/ipv6/datagram.c
+++ b/net/ipv6/datagram.c
@@ -771,7 +771,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, &ipc6->sockc);
+                       err = __sock_cmsg_send(sk, cmsg, &ipc6->sockc);
                        if (err)
                                return err;
                        continue;