From patchwork Tue Apr 19 07:10:01 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xin Long X-Patchwork-Id: 612005 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3qpx3l296pz9syq for ; Tue, 19 Apr 2016 17:10:11 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=a/UWOzFV; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752537AbcDSHKI (ORCPT ); Tue, 19 Apr 2016 03:10:08 -0400 Received: from mail-pa0-f68.google.com ([209.85.220.68]:34773 "EHLO mail-pa0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752051AbcDSHKG (ORCPT ); Tue, 19 Apr 2016 03:10:06 -0400 Received: by mail-pa0-f68.google.com with SMTP id hb4so925368pac.1; Tue, 19 Apr 2016 00:10:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=sJD7x3reNZWklZIgPVVTwpt4o2QNPhXojFulqLDddGU=; b=a/UWOzFVSpP394TfwCEJE4NiEHZOP8COFZcbQRuLeqrKf6xPHMVAuUk6ONN5FPM61A qW4e8vXcTe98ZIjrqku++H9eP9O0EGwV0RLY/1ZZDLPuOX4cif+Cd9SYopQU8UtuLWn/ Kw1y/JrhfSTMPx4yPKO9+wl9WIJkl57bFcYlcdS/0OFlVsKza7tVvMlh3NoboCB/yoyv bVvo1e1dxRPD/mh7+dd1aFi2qLdmT2YsJXdRORn+rXKI/alWZUPomP7PphqGZOJ9JegS sMcvKmdmCFUqgUp/HZ6UY2k9yUXi2Dr7jUDs8hC/dL5jmgiU3ZkvHhB4qZTqnDXJWTqR 1Bfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=sJD7x3reNZWklZIgPVVTwpt4o2QNPhXojFulqLDddGU=; b=M5uqc0t4Ia5dCrhcnyIaiciTE+2+Qbv0zPP8Z390CrtLUn8repPYx3BksG66Syf7n4 uDjayRozPvnlpEGy4yoC6NBW2dLX6VWg5lq14IdMLgqIj993+cyqjJ5D8cLbZSYP/Nwi gj4V/LBzbi+rpJ6YAFWYmd/inxinf9lgjIJb2uP9ibru85QGhbVjbxKLyvQ4RUKLzvem J1s6wEXaFsTvPUFnZHqSyd2H+I8TTZJyVrn7GcB5XdDI9qPQ1X0bhz9vo9uA9q/uB88p NcOIJuy3gTVA6BwCcICIg9izlwtEwoJGX4VprEmBNKZEqxnfN72ojz7HX9aK0biHSy0M ydrg== X-Gm-Message-State: AOPr4FUmy0LQllWI9sEZGp1Zw5x4wLtdbNHNZmPqaSUJYsuvIHA3Ha0HBET7yXFBlbyBwQ== X-Received: by 10.66.119.177 with SMTP id kv17mr1929990pab.124.1461049804624; Tue, 19 Apr 2016 00:10:04 -0700 (PDT) Received: from localhost (138.128.208.20.16clouds.com. [138.128.208.20]) by smtp.gmail.com with ESMTPSA id g21sm8765788pfb.7.2016.04.19.00.10.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 19 Apr 2016 00:10:03 -0700 (PDT) From: Xin Long To: network dev , linux-sctp@vger.kernel.org Cc: Marcelo Ricardo Leitner , Vlad Yasevich , daniel@iogearbox.net, davem@davemloft.net, eric.dumazet@gmail.com, jsitnick@redhat.com Subject: [PATCHv3 net-next] net: use jiffies_to_msecs to replace EXPIRES_IN_MS in inet/sctp_diag Date: Tue, 19 Apr 2016 15:10:01 +0800 Message-Id: <87a0e83132ce64a3fe2266a5323fa6577a2e5c96.1461049801.git.lucien.xin@gmail.com> X-Mailer: git-send-email 2.1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org EXPIRES_IN_MS macro comes from net/ipv4/inet_diag.c and dates back to before jiffies_to_msecs() has been introduced. Now we can remove it and use jiffies_to_msecs(). Signed-off-by: Xin Long Acked-by: Jakub Sitnicki Acked-by: Marcelo Ricardo Leitner Acked-by: Eric Dumazet --- net/ipv4/inet_diag.c | 12 ++++++------ net/sctp/sctp_diag.c | 6 ++---- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/net/ipv4/inet_diag.c b/net/ipv4/inet_diag.c index 70212bd..ad7956f 100644 --- a/net/ipv4/inet_diag.c +++ b/net/ipv4/inet_diag.c @@ -197,27 +197,27 @@ int inet_sk_diag_fill(struct sock *sk, struct inet_connection_sock *icsk, goto out; } -#define EXPIRES_IN_MS(tmo) DIV_ROUND_UP((tmo - jiffies) * 1000, HZ) - if (icsk->icsk_pending == ICSK_TIME_RETRANS || icsk->icsk_pending == ICSK_TIME_EARLY_RETRANS || icsk->icsk_pending == ICSK_TIME_LOSS_PROBE) { r->idiag_timer = 1; r->idiag_retrans = icsk->icsk_retransmits; - r->idiag_expires = EXPIRES_IN_MS(icsk->icsk_timeout); + r->idiag_expires = + jiffies_to_msecs(icsk->icsk_timeout - jiffies); } else if (icsk->icsk_pending == ICSK_TIME_PROBE0) { r->idiag_timer = 4; r->idiag_retrans = icsk->icsk_probes_out; - r->idiag_expires = EXPIRES_IN_MS(icsk->icsk_timeout); + r->idiag_expires = + jiffies_to_msecs(icsk->icsk_timeout - jiffies); } else if (timer_pending(&sk->sk_timer)) { r->idiag_timer = 2; r->idiag_retrans = icsk->icsk_probes_out; - r->idiag_expires = EXPIRES_IN_MS(sk->sk_timer.expires); + r->idiag_expires = + jiffies_to_msecs(sk->sk_timer.expires - jiffies); } else { r->idiag_timer = 0; r->idiag_expires = 0; } -#undef EXPIRES_IN_MS if ((ext & (1 << (INET_DIAG_INFO - 1))) && handler->idiag_info_size) { attr = nla_reserve(skb, INET_DIAG_INFO, diff --git a/net/sctp/sctp_diag.c b/net/sctp/sctp_diag.c index 98ecd16..bb2d8d9 100644 --- a/net/sctp/sctp_diag.c +++ b/net/sctp/sctp_diag.c @@ -48,10 +48,8 @@ static void inet_diag_msg_sctpasoc_fill(struct inet_diag_msg *r, r->idiag_state = asoc->state; r->idiag_timer = SCTP_EVENT_TIMEOUT_T3_RTX; r->idiag_retrans = asoc->rtx_data_chunks; -#define EXPIRES_IN_MS(tmo) DIV_ROUND_UP((tmo - jiffies) * 1000, HZ) - r->idiag_expires = - EXPIRES_IN_MS(asoc->timeouts[SCTP_EVENT_TIMEOUT_T3_RTX]); -#undef EXPIRES_IN_MS + r->idiag_expires = jiffies_to_msecs( + asoc->timeouts[SCTP_EVENT_TIMEOUT_T3_RTX] - jiffies); } static int inet_diag_msg_sctpladdrs_fill(struct sk_buff *skb,