diff options
author | Mark Brown <broonie@kernel.org> | 2015-03-11 12:53:25 +0000 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-03-11 12:53:25 +0000 |
commit | 11dd60447e3b1018f9cae66737cb902b519d3454 (patch) | |
tree | a33d8bcb18a3becae2161aa215c25d5674626c57 /drivers/net/ethernet/pasemi/pasemi_mac.c | |
parent | 8d0c38a3f2a6bb70e952f127ed817fc7a08db52c (diff) | |
parent | 9eccca0843205f87c00404b663188b88eb248051 (diff) |
Merge tag 'v4.0-rc3' into asoc-intel
Linux 4.0-rc3
Diffstat (limited to 'drivers/net/ethernet/pasemi/pasemi_mac.c')
-rw-r--r-- | drivers/net/ethernet/pasemi/pasemi_mac.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/net/ethernet/pasemi/pasemi_mac.c b/drivers/net/ethernet/pasemi/pasemi_mac.c index 44e8d7d25547..57a6e6cd74fc 100644 --- a/drivers/net/ethernet/pasemi/pasemi_mac.c +++ b/drivers/net/ethernet/pasemi/pasemi_mac.c @@ -1239,11 +1239,9 @@ static int pasemi_mac_open(struct net_device *dev) if (mac->phydev) phy_start(mac->phydev); - init_timer(&mac->tx->clean_timer); - mac->tx->clean_timer.function = pasemi_mac_tx_timer; - mac->tx->clean_timer.data = (unsigned long)mac->tx; - mac->tx->clean_timer.expires = jiffies+HZ; - add_timer(&mac->tx->clean_timer); + setup_timer(&mac->tx->clean_timer, pasemi_mac_tx_timer, + (unsigned long)mac->tx); + mod_timer(&mac->tx->clean_timer, jiffies + HZ); return 0; |