summaryrefslogtreecommitdiff
path: root/include/net
diff options
context:
space:
mode:
authorNick Desaulniers <ndesaulniers@google.com>2018-08-02 00:57:59 +0300
committerDavid S. Miller <davem@davemloft.net>2018-08-14 20:04:36 +0300
commit96d18d8254dc5a3f0067a629866af4165b3afe32 (patch)
treecdf690d799349607c6153b5fd78218ddf15befbc /include/net
parent6feddb4913011437aaafe34d672aceebdb7c201f (diff)
downloadlinux-96d18d8254dc5a3f0067a629866af4165b3afe32.tar.xz
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>
Diffstat (limited to 'include/net')
-rw-r--r--include/net/inet_connection_sock.h3
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 @@
#include <linux/string.h>
#include <linux/timer.h>
#include <linux/poll.h>
+#include <linux/kernel.h>
#include <net/inet_sock.h>
#include <net/request_sock.h>
@@ -225,7 +226,7 @@ static inline void inet_csk_reset_xmit_timer(struct sock *sk, const int what,
if (when > max_when) {
pr_debug("reset_xmit_timer: sk=%p %d when=0x%lx, caller=%p\n",
- sk, what, when, current_text_addr());
+ sk, what, when, (void *)_THIS_IP_);
when = max_when;
}