Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-10 15:58:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

drivers/net/appletalk: Convert timers to use timer_setup()

Browse Source 
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. Adds a static variable to hold the
polled net_device.

Cc: David Howells <dhowells@redhat.com>
Cc: netdev@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Kees Cook 2017-10-16 17:29:24 -07:00 committed by David S. Miller
parent 9ba650a4eb
commit 5f2585d4e5
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/net/appletalk/ltpc.c
View File

@ -694,6 +694,7 @@ static int do_read(struct net_device *dev, void *cbuf, int cbuflen,
/* end of idle handlers -- what should be seen is do_read, do_write */ /* end of idle handlers -- what should be seen is do_read, do_write */
static struct timer_list ltpc_timer; static struct timer_list ltpc_timer;
static struct net_device *ltpc_timer_dev;
static netdev_tx_t ltpc_xmit(struct sk_buff *skb, struct net_device *dev); static netdev_tx_t ltpc_xmit(struct sk_buff *skb, struct net_device *dev);
@ -867,10 +868,8 @@ static void set_multicast_list(struct net_device *dev)
static int ltpc_poll_counter; static int ltpc_poll_counter;
static void ltpc_poll(unsigned long l) static void ltpc_poll(struct timer_list *unused)
{ {
struct net_device *dev = (struct net_device *) l;
del_timer(&ltpc_timer); del_timer(&ltpc_timer);
if(debug & DEBUG_VERBOSE) { if(debug & DEBUG_VERBOSE) {
@ -882,7 +881,7 @@ static void ltpc_poll(unsigned long l)
} }
/* poll 20 times per second */ /* poll 20 times per second */
idle(dev); idle(ltpc_timer_dev);
ltpc_timer.expires = jiffies + HZ/20; ltpc_timer.expires = jiffies + HZ/20;
add_timer(&ltpc_timer); add_timer(&ltpc_timer);
} }
@ -1161,7 +1160,8 @@ struct net_device * __init ltpc_probe(void)
dev->irq = 0; dev->irq = 0;
/* polled mode -- 20 times per second */ /* polled mode -- 20 times per second */
/* this is really, really slow... should it poll more often? */ /* this is really, really slow... should it poll more often? */
setup_timer(&ltpc_timer, ltpc_poll, (unsigned long)dev); ltpc_timer_dev = dev;
timer_setup(&ltpc_timer, ltpc_poll, 0);
ltpc_timer.expires = jiffies + HZ/20; ltpc_timer.expires = jiffies + HZ/20;
add_timer(&ltpc_timer); add_timer(&ltpc_timer);