From mboxrd@z Thu Jan 1 00:00:00 1970 From: Nick Desaulniers Subject: [PATCH] inet/connection_sock: prefer _THIS_IP_ to current_text_addr Date: Wed, 1 Aug 2018 14:57:59 -0700 Message-ID: <20180801215759.103758-1-ndesaulniers@google.com> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Cc: natechancellor@gmail.com, Nick Desaulniers , netdev@vger.kernel.org, linux-kernel@vger.kernel.org To: davem@davemloft.net Return-path: Received: from mail-io0-f202.google.com ([209.85.223.202]:46515 "EHLO mail-io0-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731991AbeHAXqA (ORCPT ); Wed, 1 Aug 2018 19:46:00 -0400 Received: by mail-io0-f202.google.com with SMTP id c5-v6so88087ioi.13 for ; Wed, 01 Aug 2018 14:58:07 -0700 (PDT) Sender: netdev-owner@vger.kernel.org List-ID: 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 --- 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 #include #include +#include #include #include @@ -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