Message ID | 1508200182-104605-58-git-send-email-keescook@chromium.org |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show
Return-Path: <netdev-owner@vger.kernel.org> X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="SFISUOqy"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yGGqQ3rxrz9sP1 for <patchwork-incoming@ozlabs.org>; Tue, 17 Oct 2017 11:52:02 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933519AbdJQAvb (ORCPT <rfc822;patchwork-incoming@ozlabs.org>); Mon, 16 Oct 2017 20:51:31 -0400 Received: from mail-pg0-f49.google.com ([74.125.83.49]:55669 "EHLO mail-pg0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756232AbdJQAr1 (ORCPT <rfc822;netdev@vger.kernel.org>); Mon, 16 Oct 2017 20:47:27 -0400 Received: by mail-pg0-f49.google.com with SMTP id b11so61873pgn.12 for <netdev@vger.kernel.org>; Mon, 16 Oct 2017 17:47:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=e80b0TY09yoXU9NSv88YpnAoIxPidkji781EzrQA1Yc=; b=SFISUOqyo6TXeQwlQLB6wSJAT2WjeTD3IGxmDX9AL99P47p/N5djldg+kl+TsahCh8 sD3kSUhFOvovoeDrFGHnGEdwCdEuRnlHzuIsOjNMpxKJpJLlmB3od0Uk02d6sUgP7Ypy BOt77w1KlROOaPRu8SpyHr5mWPLWo86R07vt8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=e80b0TY09yoXU9NSv88YpnAoIxPidkji781EzrQA1Yc=; b=PH+lZrGiH/W/EsHY6TaQc1QkB4skn2uJUPqFbirxNxZkm8UtKx0IEVdqDIwyCF46Pn BgOHHpp8uzdKmW2zIDxXEcwm8MApkyw3OxKjPhRpfkhPGtGLMBEkZFAZs+P0dFZlXq/S Xn5PHF0Aj2ZQregJ8o7icrX9SlZUEmTRZPf4RveayE7hiW6QZkYgvj3Bm0zxyhbYVByM jXF+btVEpWZrCipyuE2FygRSpGNok2QXa66ssEQ1t/9v+BpxoEwfqElQPWsN5MLntDyA /sn1jm7IDKlfbKBwjZMAMuBMBYtSH7wr4Ck/J3B8twOsiiyYRQfqFeX836eZ5/5JWy2P pOkg== X-Gm-Message-State: AMCzsaX5PKuJf3xf9uAKtw1GvHD6ASZhvbxvrnCJG281zwmlhNmG9d4a DyYkPgQP3vuhN0PQofzhPw5NsQ== X-Google-Smtp-Source: AOwi7QDbVHXbh0OKGzv/v/Rxjc0rPh7rbpn+qezQQ1gib7+a4pndVQvo9L4dEJitSQftOH/2IDXaSQ== X-Received: by 10.99.121.201 with SMTP id u192mr9472691pgc.69.1508201247330; Mon, 16 Oct 2017 17:47:27 -0700 (PDT) Received: from www.outflux.net (173-164-112-133-Oregon.hfc.comcastbusiness.net. [173.164.112.133]) by smtp.gmail.com with ESMTPSA id r64sm16101923pfg.25.2017.10.16.17.47.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Oct 2017 17:47:24 -0700 (PDT) From: Kees Cook <keescook@chromium.org> To: "David S. Miller" <davem@davemloft.net> Cc: Kees Cook <keescook@chromium.org>, Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>, Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>, netdev@vger.kernel.org, Thomas Gleixner <tglx@linutronix.de>, linux-kernel@vger.kernel.org Subject: [PATCH 57/58] ipv4: timewait: Convert timers to use timer_setup() Date: Mon, 16 Oct 2017 17:29:41 -0700 Message-Id: <1508200182-104605-58-git-send-email-keescook@chromium.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1508200182-104605-1-git-send-email-keescook@chromium.org> References: <1508200182-104605-1-git-send-email-keescook@chromium.org> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: <netdev.vger.kernel.org> X-Mailing-List: netdev@vger.kernel.org |
Series |
networking: Convert timers to use timer_setup()
|
expand
|
diff --git a/net/ipv4/inet_timewait_sock.c b/net/ipv4/inet_timewait_sock.c index 5b039159e67a..a4bab81f1462 100644 --- a/net/ipv4/inet_timewait_sock.c +++ b/net/ipv4/inet_timewait_sock.c @@ -142,9 +142,9 @@ void __inet_twsk_hashdance(struct inet_timewait_sock *tw, struct sock *sk, } EXPORT_SYMBOL_GPL(__inet_twsk_hashdance); -static void tw_timer_handler(unsigned long data) +static void tw_timer_handler(struct timer_list *t) { - struct inet_timewait_sock *tw = (struct inet_timewait_sock *)data; + struct inet_timewait_sock *tw = from_timer(tw, t, tw_timer); if (tw->tw_kill) __NET_INC_STATS(twsk_net(tw), LINUX_MIB_TIMEWAITKILLED); @@ -188,8 +188,7 @@ struct inet_timewait_sock *inet_twsk_alloc(const struct sock *sk, tw->tw_prot = sk->sk_prot_creator; atomic64_set(&tw->tw_cookie, atomic64_read(&sk->sk_cookie)); twsk_net_set(tw, sock_net(sk)); - setup_pinned_timer(&tw->tw_timer, tw_timer_handler, - (unsigned long)tw); + timer_setup(&tw->tw_timer, tw_timer_handler, TIMER_PINNED); /* * Because we use RCU lookups, we should not set tw_refcnt * to a non null value before everything is setup for this
In preparation for unconditionally passing the struct timer_list pointer to all timer callbacks, switch to using the new timer_setup() and from_timer() to pass the timer pointer explicitly. Cc: "David S. Miller" <davem@davemloft.net> Cc: Alexey Kuznetsov <kuznet@ms2.inr.ac.ru> Cc: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org> Cc: netdev@vger.kernel.org Signed-off-by: Kees Cook <keescook@chromium.org> --- net/ipv4/inet_timewait_sock.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)