File tree Expand file tree Collapse file tree 1 file changed +5
-5
lines changed
drivers/net/ethernet/dlink Expand file tree Collapse file tree 1 file changed +5
-5
lines changed Original file line number Diff line number Diff line change @@ -68,7 +68,7 @@ static const int max_intrloop = 50;
68
68
static const int multicast_filter_limit = 0x40 ;
69
69
70
70
static int rio_open (struct net_device * dev );
71
- static void rio_timer (unsigned long data );
71
+ static void rio_timer (struct timer_list * t );
72
72
static void rio_tx_timeout (struct net_device * dev );
73
73
static netdev_tx_t start_xmit (struct sk_buff * skb , struct net_device * dev );
74
74
static irqreturn_t rio_interrupt (int irq , void * dev_instance );
@@ -644,7 +644,7 @@ static int rio_open(struct net_device *dev)
644
644
return i ;
645
645
}
646
646
647
- setup_timer (& np -> timer , rio_timer , ( unsigned long ) dev );
647
+ timer_setup (& np -> timer , rio_timer , 0 );
648
648
np -> timer .expires = jiffies + 1 * HZ ;
649
649
add_timer (& np -> timer );
650
650
@@ -655,10 +655,10 @@ static int rio_open(struct net_device *dev)
655
655
}
656
656
657
657
static void
658
- rio_timer (unsigned long data )
658
+ rio_timer (struct timer_list * t )
659
659
{
660
- struct net_device * dev = ( struct net_device * ) data ;
661
- struct netdev_private * np = netdev_priv ( dev );
660
+ struct netdev_private * np = from_timer ( np , t , timer ) ;
661
+ struct net_device * dev = pci_get_drvdata ( np -> pdev );
662
662
unsigned int entry ;
663
663
int next_tick = 1 * HZ ;
664
664
unsigned long flags ;
You can’t perform that action at this time.
0 commit comments