diff options
author | Nick Desaulniers <ndesaulniers@google.com> | 2018-08-01 17:57:59 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2018-08-14 13:04:36 -0400 |
commit | 96d18d8254dc5a3f0067a629866af4165b3afe32 (patch) | |
tree | cdf690d799349607c6153b5fd78218ddf15befbc | |
parent | 6feddb4913011437aaafe34d672aceebdb7c201f (diff) |
inet/connection_sock: prefer _THIS_IP_ to current_text_addr
As part of the effort to reduce the code duplication between _THIS_IP_
and current_text_addr(), let's consolidate callers of
current_text_addr() to use _THIS_IP_.
Signed-off-by: Nick Desaulniers <ndesaulniers@google.com>
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | include/net/inet_connection_sock.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/net/inet_connection_sock.h b/include/net/inet_connection_sock.h index fa43b82607d9..371b3b45fd5c 100644 --- a/include/net/inet_connection_sock.h +++ b/include/net/inet_connection_sock.h | |||
@@ -19,6 +19,7 @@ | |||
19 | #include <linux/string.h> | 19 | #include <linux/string.h> |
20 | #include <linux/timer.h> | 20 | #include <linux/timer.h> |
21 | #include <linux/poll.h> | 21 | #include <linux/poll.h> |
22 | #include <linux/kernel.h> | ||
22 | 23 | ||
23 | #include <net/inet_sock.h> | 24 | #include <net/inet_sock.h> |
24 | #include <net/request_sock.h> | 25 | #include <net/request_sock.h> |
@@ -225,7 +226,7 @@ static inline void inet_csk_reset_xmit_timer(struct sock *sk, const int what, | |||
225 | 226 | ||
226 | if (when > max_when) { | 227 | if (when > max_when) { |
227 | pr_debug("reset_xmit_timer: sk=%p %d when=0x%lx, caller=%p\n", | 228 | pr_debug("reset_xmit_timer: sk=%p %d when=0x%lx, caller=%p\n", |
228 | sk, what, when, current_text_addr()); | 229 | sk, what, when, (void *)_THIS_IP_); |
229 | when = max_when; | 230 | when = max_when; |
230 | } | 231 | } |
231 | 232 | ||