From: Nick Desaulniers <ndesaulniers@google.com>
To: davem@davemloft.net
Cc: natechancellor@gmail.com,
Nick Desaulniers <ndesaulniers@google.com>,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH] inet/connection_sock: prefer _THIS_IP_ to current_text_addr
Date: Wed, 1 Aug 2018 14:57:59 -0700 [thread overview]
Message-ID: <20180801215759.103758-1-ndesaulniers@google.com> (raw)
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>
---
include/net/inet_connection_sock.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/include/net/inet_connection_sock.h b/include/net/inet_connection_sock.h
index 0a6c9e0f2b5a..f2a87e85c07b 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>
@@ -224,7 +225,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;
}
--
2.18.0.597.ga71716f1ad-goog
next reply other threads:[~2018-08-01 21:58 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-01 21:57 Nick Desaulniers [this message]
2018-08-02 1:42 ` David Miller
2018-08-02 4:58 ` Nathan Chancellor
2018-08-02 5:08 ` Nathan Chancellor
2018-08-02 17:07 ` Nick Desaulniers
2018-08-02 21:42 ` David Miller
2018-08-02 22:10 ` Nick Desaulniers
2018-08-02 22:17 ` David Miller
2018-08-02 22:29 ` Nick Desaulniers
2018-08-13 21:10 ` Nick Desaulniers
2018-08-14 17:04 ` David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180801215759.103758-1-ndesaulniers@google.com \
--to=ndesaulniers@google.com \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=natechancellor@gmail.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®