net/core: Collapse redundant sk_timer callback data assignments

The core sk_timer initializer can provide the common .data assignment
instead of it being set separately in users.

Cc: "David S. Miller" <davem@davemloft.net>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Andrew Hendry <andrew.hendry@gmail.com>
Cc: Eric Dumazet <edumazet@google.com>
Cc: Paolo Abeni <pabeni@redhat.com>
Cc: David Howells <dhowells@redhat.com>
Cc: Colin Ian King <colin.king@canonical.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: linzhang <xiaolou4617@gmail.com>
Cc: netdev@vger.kernel.org
Cc: linux-hams@vger.kernel.org
Cc: linux-x25@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/core/sock.c b/net/core/sock.c
index 23953b741a41fbcf4a6ffb0dd5bf05bd5266b99d..f577df17bcf2401c51df09b96fe1b2a5425d82dc 100644 (file)
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -2683,7 +2683,7 @@ void sock_init_data(struct socket *sock, struct sock *sk)
        sk_init_common(sk);
        sk->sk_send_head        =       NULL;
 
-       init_timer(&sk->sk_timer);
+       setup_timer(&sk->sk_timer, NULL, (unsigned long)sk);
 
        sk->sk_allocation       =       GFP_KERNEL;
        sk->sk_rcvbuf           =       sysctl_rmem_default;

diff --git a/net/netrom/nr_timer.c b/net/netrom/nr_timer.c
index 94d05806a9a2431c662452cea5f7cab428620dc2..f84ce71f1f5f6464e3f5d7baa38fd9bf755b900b 100644 (file)
--- a/net/netrom/nr_timer.c
+++ b/net/netrom/nr_timer.c
@@ -45,7 +45,6 @@ void nr_init_timers(struct sock *sk)
        setup_timer(&nr->idletimer, nr_idletimer_expiry, (unsigned long)sk);
 
        /* initialized by sock_init_data */
-       sk->sk_timer.data     = (unsigned long)sk;
        sk->sk_timer.function = &nr_heartbeat_expiry;
 }
 

diff --git a/net/rose/rose_timer.c b/net/rose/rose_timer.c
index 3b89d66f15bbe30e20a430fcb613373165de87cb..e082011852145147859ecadddd4c78797b9f52eb 100644 (file)
--- a/net/rose/rose_timer.c
+++ b/net/rose/rose_timer.c
@@ -36,7 +36,6 @@ void rose_start_heartbeat(struct sock *sk)
 {
        del_timer(&sk->sk_timer);
 
-       sk->sk_timer.data     = (unsigned long)sk;
        sk->sk_timer.function = &rose_heartbeat_expiry;
        sk->sk_timer.expires  = jiffies + 5 * HZ;
 

diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c
index ac095936552d945d864facdb6b7bacd48655b47f..c590c0bd1393390ef0a74350aaf36a783c67d3c6 100644 (file)
--- a/net/x25/af_x25.c
+++ b/net/x25/af_x25.c
@@ -414,7 +414,6 @@ static void __x25_destroy_socket(struct sock *sk)
                /* Defer: outstanding buffers */
                sk->sk_timer.expires  = jiffies + 10 * HZ;
                sk->sk_timer.function = x25_destroy_timer;
-               sk->sk_timer.data = (unsigned long)sk;
                add_timer(&sk->sk_timer);
        } else {
                /* drop last reference so sock_put will free */

diff --git a/net/x25/x25_timer.c b/net/x25/x25_timer.c
index 5c5db1a36399d1ef26d24df168ceb47b871b1e3d..de5cec41d100881d79ea8ace02f88e1f71711420 100644 (file)
--- a/net/x25/x25_timer.c
+++ b/net/x25/x25_timer.c
@@ -36,7 +36,6 @@ void x25_init_timers(struct sock *sk)
        setup_timer(&x25->timer, x25_timer_expiry, (unsigned long)sk);
 
        /* initialized by sock_init_data */
-       sk->sk_timer.data     = (unsigned long)sk;
        sk->sk_timer.function = &x25_heartbeat_expiry;
 }