{"id":808478,"url":"http://patchwork.ozlabs.org/api/patches/808478/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/1504222183-61202-26-git-send-email-keescook@chromium.org/","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/projects/7/?format=json","name":"Linux network development","link_name":"netdev","list_id":"netdev.vger.kernel.org","list_email":"netdev@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<1504222183-61202-26-git-send-email-keescook@chromium.org>","list_archive_url":null,"date":"2017-08-31T23:29:37","name":"[25/31] net/atm/mpc: Use separate static data field with with static timer","commit_ref":null,"pull_url":null,"state":"not-applicable","archived":true,"hash":"c3b1692758d3823b671ce3ff2dd715a71989ac5c","submitter":{"id":10641,"url":"http://patchwork.ozlabs.org/api/people/10641/?format=json","name":"Kees Cook","email":"keescook@chromium.org"},"delegate":{"id":34,"url":"http://patchwork.ozlabs.org/api/users/34/?format=json","username":"davem","first_name":"David","last_name":"Miller","email":"davem@davemloft.net"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/1504222183-61202-26-git-send-email-keescook@chromium.org/mbox/","series":[{"id":923,"url":"http://patchwork.ozlabs.org/api/series/923/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/list/?series=923","date":"2017-08-31T23:29:25","name":null,"version":1,"mbox":"http://patchwork.ozlabs.org/series/923/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/808478/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/808478/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"patchwork-incoming@ozlabs.org","Delivered-To":"patchwork-incoming@ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=netdev-owner@vger.kernel.org;\n\treceiver=)","ozlabs.org; dkim=pass (1024-bit key;\n\tunprotected) header.d=chromium.org header.i=@chromium.org\n\theader.b=\"LALAPGJZ\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xjzcM0RG4z9s8J\n\tfor ;\n\tFri, 1 Sep 2017 09:49:23 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1752255AbdHaXtU (ORCPT );\n\tThu, 31 Aug 2017 19:49:20 -0400","from mail-pg0-f42.google.com ([74.125.83.42]:37107 \"EHLO\n\tmail-pg0-f42.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1752242AbdHaXtT (ORCPT\n\t); Thu, 31 Aug 2017 19:49:19 -0400","by mail-pg0-f42.google.com with SMTP id 83so3183336pgb.4\n\tfor ; Thu, 31 Aug 2017 16:49:18 -0700 (PDT)","from www.outflux.net\n\t(173-164-112-133-Oregon.hfc.comcastbusiness.net. [173.164.112.133])\n\tby smtp.gmail.com with ESMTPSA id\n\tv68sm913200pfv.111.2017.08.31.16.49.17\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tThu, 31 Aug 2017 16:49:17 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=chromium.org; s=google;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references;\n\tbh=30d1GZJO9lEPDY5b94ywee1JVuBCeCsPQqtgq5YziHo=;\n\tb=LALAPGJZDY6QbXNtJPtexyEAeYYUtIhS+Q7TLIpzavemu5hxdk3DSuuw9mNYWY/Fs7\n\tg6+uMSqyqI7BZe9U8Jq53uGujWj9VWY5++q5vCU+jpLXrlM3w1H86OBkEWIWBAYiM0S9\n\ths38pfnHq5cu0MRmpzzWy+rxpM5RMEAtB6Ar4=","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references;\n\tbh=30d1GZJO9lEPDY5b94ywee1JVuBCeCsPQqtgq5YziHo=;\n\tb=SJAxtzeK0Zb3Bs2bd3BoBrdIh2ZIx+uJX+bzV5pT8sBNyNQfYShP59kMTbpIqon22A\n\tdhxRfl4QjFpjxkcgttfzgf9W08pQEkosj9vQgvpUb+3PnJfwGaMKF16ca8rSu9ta1lWe\n\tMv0JIofPfNkx33rVcnUwwEa+1HnHbf9TVphE82FUdBF8WCPcoPz170rq0cCujz2i69Ul\n\tgZFfRoH59HTp6S8zvXRRVERvE2r28ANuI0mN1YVoZyF+b2YOtfTzrOz9YVKw5uiJl60q\n\tgyhXgkj1rt2//rJwWv34YO9hDECiZ3FXIJjI3q/NYZNHBGZmRlMBLmnWWF8i9DL8tUz7\n\tTUxA==","X-Gm-Message-State":"AHPjjUjlZ3ewQbvF7nyyyP2yUpilBCjAxngC41+yZoxDr2qy2zI+tCZm\n\thUdDQpJHNP2RNkRo","X-Google-Smtp-Source":"ADKCNb5Ov+jzg5a5QQ6AET2iBl6YQf6lVEqZNqe/SIVzrYvDHmtXvq+t5LqvYrlq4zO0weCxtAJGJQ==","X-Received":"by 10.98.60.29 with SMTP id j29mr198208pfa.104.1504223358657;\n\tThu, 31 Aug 2017 16:49:18 -0700 (PDT)","From":"Kees Cook ","To":"Thomas Gleixner ","Cc":"Kees Cook ,\n\t\"David S. Miller\" ,\n\tAndrew Morton ,\n\tAlexey Dobriyan ,\n\t\"Reshetova, Elena\" ,\n\tnetdev@vger.kernel.org, linux-kernel@vger.kernel.org","Subject":"[PATCH 25/31] net/atm/mpc: Use separate static data field with with\n\tstatic 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"},"content":"In preparation for changing the timer callback argument to the timer\npointer, move to a separate static data variable.\n\nCc: \"David S. Miller\" \nCc: Andrew Morton \nCc: Alexey Dobriyan \nCc: \"Reshetova, Elena\" \nCc: netdev@vger.kernel.org\nSigned-off-by: Kees Cook \n---\n net/atm/mpc.c | 10 +++++-----\n 1 file changed, 5 insertions(+), 5 deletions(-)","diff":"diff --git a/net/atm/mpc.c b/net/atm/mpc.c\nindex 5baa31b8500c..fc24a46500ae 100644\n--- a/net/atm/mpc.c\n+++ b/net/atm/mpc.c\n@@ -95,7 +95,7 @@ static netdev_tx_t mpc_send_packet(struct sk_buff *skb,\n static int mpoa_event_listener(struct notifier_block *mpoa_notifier,\n \t\t\t unsigned long event, void *dev);\n static void mpc_timer_refresh(void);\n-static void mpc_cache_check(unsigned long checking_time);\n+static void mpc_cache_check(unsigned long unused);\n \n static struct llc_snap_hdr llc_snap_mpoa_ctrl = {\n \t0xaa, 0xaa, 0x03,\n@@ -121,7 +121,8 @@ static struct notifier_block mpoa_notifier = {\n \n struct mpoa_client *mpcs = NULL; /* FIXME */\n static struct atm_mpoa_qos *qos_head = NULL;\n-static DEFINE_TIMER(mpc_timer, NULL);\n+static DEFINE_TIMER(mpc_timer, mpc_cache_check);\n+static unsigned long checking_time;\n \n \n static struct mpoa_client *find_mpc_by_itfnum(int itf)\n@@ -1411,12 +1412,11 @@ static void clean_up(struct k_message *msg, struct mpoa_client *mpc, int action)\n static void mpc_timer_refresh(void)\n {\n \tmpc_timer.expires = jiffies + (MPC_P2 * HZ);\n-\tmpc_timer.data = mpc_timer.expires;\n-\tmpc_timer.function = mpc_cache_check;\n+\tchecking_time = mpc_timer.expires;\n \tadd_timer(&mpc_timer);\n }\n \n-static void mpc_cache_check(unsigned long checking_time)\n+static void mpc_cache_check(unsigned long unused)\n {\n \tstruct mpoa_client *mpc = mpcs;\n \tstatic unsigned long previous_resolving_check_time;\n","prefixes":["25/31"]}