[56/58] um: net: Convert timers to use timer_setup()

Message ID	1508200182-104605-57-git-send-email-keescook@chromium.org
State	Accepted, archived
Delegated to:	David Miller
Headers	show Return-Path: <netdev-owner@vger.kernel.org> From: Kees Cook <keescook@chromium.org> To: "David S. Miller" <davem@davemloft.net> Cc: Kees Cook <keescook@chromium.org>, Jeff Dike <jdike@addtoit.com>, Richard Weinberger <richard@nod.at>, Jarod Wilson <jarod@redhat.com>, user-mode-linux-devel@lists.sourceforge.net, user-mode-linux-user@lists.sourceforge.net, netdev@vger.kernel.org, Thomas Gleixner <tglx@linutronix.de>, linux-kernel@vger.kernel.org Subject: [PATCH 56/58] um: net: Convert timers to use timer_setup() Date: Mon, 16 Oct 2017 17:29:40 -0700 Message-Id: <1508200182-104605-57-git-send-email-keescook@chromium.org> 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
Series	networking: Convert timers to use timer_setup() \| expand [00/58] networking: Convert timers to use timer_setup() [01/58] net/decnet: Convert timers to use timer_setup() [02/58] net/lapb: Convert timers to use timer_setup() [03/58] net/rose: Convert timers to use timer_setup() [04/58] net/irda-usb: Convert timers to use timer_setup() [05/58] net/irda/bfin_sir: Convert timers to use timer_setup() [06/58] net/ti/tlan: Convert timers to use timer_setup() [07/58] net/usb/usbnet: Convert timers to use timer_setup() [08/58] net/wireless/ray_cs: Convert timers to use timer_setup() [09/58] net/irda: Convert timers to use timer_setup() [10/58] isdn/hisax: Convert timers to use timer_setup() [11/58] net/hamradio/6pack: Convert timers to use timer_setup() [12/58] xfrm: Convert timers to use timer_setup() [13/58] ethernet/broadcom: Convert timers to use timer_setup() [14/58] net: tulip: de2104x: Convert timers to use timer_setup() [15/58] pcmcia/electra_cf: Convert timers to use timer_setup() [16/58] net: ethernet: stmmac: Convert timers to use timer_setup() [17/58] net/cw1200: Convert timers to use timer_setup() [18/58] net: vxge: Convert timers to use timer_setup() [19/58] drivers/atm/suni: Convert timers to use timer_setup() [20/58] atm: idt77252: Convert timers to use timer_setup() [21/58] net: tulip: Convert timers to use timer_setup() [22/58] net: can: Convert timers to use timer_setup() [23/58] drivers/net/3com: Convert timers to use timer_setup() [24/58] chelsio: Convert timers to use timer_setup() [25/58] net: amd8111e: Convert timers to use timer_setup() [26/58] bna: Convert timers to use timer_setup() [27/58] net: dl2k: Convert timers to use timer_setup() [28/58] net: ksz884x: Convert timers to use timer_setup() [29/58] forcedeth: Convert timers to use timer_setup() [30/58] mISDN: Convert timers to use timer_setup() [31/58] isdn/gigaset: Use kzalloc instead of open-coded field zeroing [32/58] isdn/gigaset: Convert timers to use timer_setup() [33/58] net: sched: Convert timers to use timer_setup() [34/58] netfilter: ipset: Convert timers to use timer_setup() [35/58] inet/connection_sock: Convert timers to use timer_setup() [36/58] inet: frags: Convert timers to use timer_setup() [37/58] net/core: Collapse redundant sk_timer callback data assignments [38/58] hdlc: Convert timers to use timer_setup() [39/58] appletalk: Remove unneeded synchronization [40/58] drivers/net/appletalk: Convert timers to use timer_setup() [41/58] net/atm/mpc: Stop using open-coded timer .data field [42/58] isdnloop: Convert timers to use timer_setup() [43/58] net: ethernet: apple: Convert timers to use timer_setup() [44/58] net: ethernet: sun: Convert timers to use timer_setup() [45/58] net: seeq: Convert timers to use timer_setup() [46/58] hamradio/scc: Convert timers to use timer_setup() [47/58] net/ethernet/sgi: Convert timers to use timer_setup() [48/58] net: usb: Convert timers to use timer_setup() [49/58] net: neterion: Convert timers to use timer_setup() [50/58] net: hns: Convert timers to use timer_setup() [51/58] ethernet/intel: Convert timers to use timer_setup() [52/58] net/core: Convert sk_timer users to use timer_setup() [53/58] net: atm: Convert timers to use timer_setup() [54/58] net/xen-netback: Convert timers to use timer_setup() [55/58] net: fs_enet: Remove unused timer [56/58] um: net: Convert timers to use timer_setup() [57/58] ipv4: timewait: Convert timers to use timer_setup() [58/58] sunrpc: Convert timers to use timer_setup()

Message ID

1508200182-104605-57-git-send-email-keescook@chromium.org

State

Accepted, archived

Delegated to:

David Miller

Headers

From: Kees Cook <keescook@chromium.org>
To: "David S. Miller" <davem@davemloft.net>
Cc: Kees Cook <keescook@chromium.org>, Jeff Dike <jdike@addtoit.com>,
	Richard Weinberger <richard@nod.at>, Jarod Wilson <jarod@redhat.com>,
	user-mode-linux-devel@lists.sourceforge.net,
	user-mode-linux-user@lists.sourceforge.net, netdev@vger.kernel.org,
	Thomas Gleixner <tglx@linutronix.de>, linux-kernel@vger.kernel.org
Subject: [PATCH 56/58] um: net: Convert timers to use timer_setup()
Date: Mon, 16 Oct 2017 17:29:40 -0700
Message-Id: <1508200182-104605-57-git-send-email-keescook@chromium.org>
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

Series

networking: Convert timers to use timer_setup() | expand

Commit Message

Kees Cook Oct. 17, 2017, 12:29 a.m. UTC

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. (Note that this timer is actually
disabled.)

Cc: Jeff Dike <jdike@addtoit.com>
Cc: Richard Weinberger <richard@nod.at>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Jarod Wilson <jarod@redhat.com>
Cc: user-mode-linux-devel@lists.sourceforge.net
Cc: user-mode-linux-user@lists.sourceforge.net
Signed-off-by: Kees Cook <keescook@chromium.org>
---
 arch/um/drivers/net_kern.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/arch/um/drivers/net_kern.c b/arch/um/drivers/net_kern.c
index 1669240c7a25..b305f8247909 100644
--- a/arch/um/drivers/net_kern.c
+++ b/arch/um/drivers/net_kern.c
@@ -168,7 +168,6 @@  static int uml_net_open(struct net_device *dev)
 		goto out_close;
 	}
 
-	lp->tl.data = (unsigned long) &lp->user;
 	netif_start_queue(dev);
 
 	/* clear buffer - it can happen that the host side of the interface
@@ -278,10 +277,11 @@  static const struct ethtool_ops uml_net_ethtool_ops = {
 	.get_ts_info	= ethtool_op_get_ts_info,
 };
 
-static void uml_net_user_timer_expire(unsigned long _conn)
+static void uml_net_user_timer_expire(struct timer_list *t)
 {
 #ifdef undef
-	struct connection *conn = (struct connection *)_conn;
+	struct uml_net_private *lp = from_timer(lp, t, tl);
+	struct connection *conn = &lp->user;
 
 	dprintk(KERN_INFO "uml_net_user_timer_expire [%p]\n", conn);
 	do_connect(conn);
@@ -458,9 +458,8 @@  static void eth_configure(int n, void *init, char *mac,
 		  .add_address 		= transport->user->add_address,
 		  .delete_address  	= transport->user->delete_address });
 
-	init_timer(&lp->tl);
+	timer_setup(&lp->tl, uml_net_user_timer_expire, 0);
 	spin_lock_init(&lp->lock);
-	lp->tl.function = uml_net_user_timer_expire;
 	memcpy(lp->mac, dev->dev_addr, sizeof(lp->mac));
 
 	if ((transport->user->init != NULL) &&

[56/58] um: net: Convert timers to use timer_setup()

Commit Message

Patch