From patchwork Thu Aug 31 23:29:37 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 808478 X-Patchwork-Delegate: davem@davemloft.net Return-Path: 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=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="LALAPGJZ"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xjzcM0RG4z9s8J for ; Fri, 1 Sep 2017 09:49:23 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752255AbdHaXtU (ORCPT ); Thu, 31 Aug 2017 19:49:20 -0400 Received: from mail-pg0-f42.google.com ([74.125.83.42]:37107 "EHLO mail-pg0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752242AbdHaXtT (ORCPT ); Thu, 31 Aug 2017 19:49:19 -0400 Received: by mail-pg0-f42.google.com with SMTP id 83so3183336pgb.4 for ; Thu, 31 Aug 2017 16:49:18 -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=30d1GZJO9lEPDY5b94ywee1JVuBCeCsPQqtgq5YziHo=; b=LALAPGJZDY6QbXNtJPtexyEAeYYUtIhS+Q7TLIpzavemu5hxdk3DSuuw9mNYWY/Fs7 g6+uMSqyqI7BZe9U8Jq53uGujWj9VWY5++q5vCU+jpLXrlM3w1H86OBkEWIWBAYiM0S9 hs38pfnHq5cu0MRmpzzWy+rxpM5RMEAtB6Ar4= 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=30d1GZJO9lEPDY5b94ywee1JVuBCeCsPQqtgq5YziHo=; b=SJAxtzeK0Zb3Bs2bd3BoBrdIh2ZIx+uJX+bzV5pT8sBNyNQfYShP59kMTbpIqon22A dhxRfl4QjFpjxkcgttfzgf9W08pQEkosj9vQgvpUb+3PnJfwGaMKF16ca8rSu9ta1lWe Mv0JIofPfNkx33rVcnUwwEa+1HnHbf9TVphE82FUdBF8WCPcoPz170rq0cCujz2i69Ul gZFfRoH59HTp6S8zvXRRVERvE2r28ANuI0mN1YVoZyF+b2YOtfTzrOz9YVKw5uiJl60q gyhXgkj1rt2//rJwWv34YO9hDECiZ3FXIJjI3q/NYZNHBGZmRlMBLmnWWF8i9DL8tUz7 TUxA== X-Gm-Message-State: AHPjjUjlZ3ewQbvF7nyyyP2yUpilBCjAxngC41+yZoxDr2qy2zI+tCZm hUdDQpJHNP2RNkRo X-Google-Smtp-Source: ADKCNb5Ov+jzg5a5QQ6AET2iBl6YQf6lVEqZNqe/SIVzrYvDHmtXvq+t5LqvYrlq4zO0weCxtAJGJQ== X-Received: by 10.98.60.29 with SMTP id j29mr198208pfa.104.1504223358657; Thu, 31 Aug 2017 16:49:18 -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 v68sm913200pfv.111.2017.08.31.16.49.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 31 Aug 2017 16:49:17 -0700 (PDT) From: Kees Cook To: Thomas Gleixner Cc: Kees Cook , "David S. Miller" , Andrew Morton , Alexey Dobriyan , "Reshetova, Elena" , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 25/31] net/atm/mpc: Use separate static data field with with static timer Date: Thu, 31 Aug 2017 16:29:37 -0700 Message-Id: <1504222183-61202-26-git-send-email-keescook@chromium.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1504222183-61202-1-git-send-email-keescook@chromium.org> References: <1504222183-61202-1-git-send-email-keescook@chromium.org> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org In preparation for changing the timer callback argument to the timer pointer, move to a separate static data variable. Cc: "David S. Miller" Cc: Andrew Morton Cc: Alexey Dobriyan Cc: "Reshetova, Elena" Cc: netdev@vger.kernel.org Signed-off-by: Kees Cook --- net/atm/mpc.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/net/atm/mpc.c b/net/atm/mpc.c index 5baa31b8500c..fc24a46500ae 100644 --- a/net/atm/mpc.c +++ b/net/atm/mpc.c @@ -95,7 +95,7 @@ static netdev_tx_t mpc_send_packet(struct sk_buff *skb, static int mpoa_event_listener(struct notifier_block *mpoa_notifier, unsigned long event, void *dev); static void mpc_timer_refresh(void); -static void mpc_cache_check(unsigned long checking_time); +static void mpc_cache_check(unsigned long unused); static struct llc_snap_hdr llc_snap_mpoa_ctrl = { 0xaa, 0xaa, 0x03, @@ -121,7 +121,8 @@ static struct notifier_block mpoa_notifier = { struct mpoa_client *mpcs = NULL; /* FIXME */ static struct atm_mpoa_qos *qos_head = NULL; -static DEFINE_TIMER(mpc_timer, NULL); +static DEFINE_TIMER(mpc_timer, mpc_cache_check); +static unsigned long checking_time; static struct mpoa_client *find_mpc_by_itfnum(int itf) @@ -1411,12 +1412,11 @@ static void clean_up(struct k_message *msg, struct mpoa_client *mpc, int action) static void mpc_timer_refresh(void) { mpc_timer.expires = jiffies + (MPC_P2 * HZ); - mpc_timer.data = mpc_timer.expires; - mpc_timer.function = mpc_cache_check; + checking_time = mpc_timer.expires; add_timer(&mpc_timer); } -static void mpc_cache_check(unsigned long checking_time) +static void mpc_cache_check(unsigned long unused) { struct mpoa_client *mpc = mpcs; static unsigned long previous_resolving_check_time;