summaryrefslogtreecommitdiffstats
path: root/net/netrom
diff options
context:
space:
mode:
authorKees Cook <keescook@chromium.org>2017-10-16 17:29:21 -0700
committerDavid S. Miller <davem@davemloft.net>2017-10-18 12:39:55 +0100
commit9f12a77e467b8ec0296cf1c3481447e1b1811f59 (patch)
tree21743d6d55df67754af37afa849e1f56e69cc5c0 /net/netrom
parent78802011fbe34331bdef6f2dfb1634011f0e4c32 (diff)
downloadlinux-9f12a77e467b8ec0296cf1c3481447e1b1811f59.tar.gz
linux-9f12a77e467b8ec0296cf1c3481447e1b1811f59.tar.bz2
linux-9f12a77e467b8ec0296cf1c3481447e1b1811f59.zip
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>
Diffstat (limited to 'net/netrom')
-rw-r--r--net/netrom/nr_timer.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/net/netrom/nr_timer.c b/net/netrom/nr_timer.c
index 94d05806a9a2..f84ce71f1f5f 100644
--- 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;
}