diff options
| author | Breno Leitao <leitao@linux.vnet.ibm.com> | 2010-07-01 05:00:17 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-07-03 06:59:05 +0200 |
| commit | 72046d84f0d6e3047f4d5a5173260141983b2b61 (patch) | |
| tree | 46e3aba833a5d9944938a18c08e5f5d81c5545ff /drivers/net | |
| parent | usbnet: Set parent device early for netdev_printk() (diff) | |
| download | linux-72046d84f0d6e3047f4d5a5173260141983b2b61.tar.xz linux-72046d84f0d6e3047f4d5a5173260141983b2b61.zip | |
qlge: Replacing add_timer() to mod_timer()
Currently qlge driver calls add_timer() instead of mod_timer().
This patch changes add_timer() to mod_timer(), which seems a better
solution.
Signed-off-by: Breno Leitao <leitao@linux.vnet.ibm.com>
Signed-off-by: Ron Mercer <ron.mercer@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/qlge/qlge_main.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/net/qlge/qlge_main.c b/drivers/net/qlge/qlge_main.c index fa4b24c49f42..509dadcd1c5a 100644 --- a/drivers/net/qlge/qlge_main.c +++ b/drivers/net/qlge/qlge_main.c @@ -4611,8 +4611,7 @@ static void ql_timer(unsigned long data) return; } - qdev->timer.expires = jiffies + (5*HZ); - add_timer(&qdev->timer); + mod_timer(&qdev->timer, jiffies + (5*HZ)); } static int __devinit qlge_probe(struct pci_dev *pdev, @@ -4808,8 +4807,7 @@ static void qlge_io_resume(struct pci_dev *pdev) netif_err(qdev, ifup, qdev->ndev, "Device was not running prior to EEH.\n"); } - qdev->timer.expires = jiffies + (5*HZ); - add_timer(&qdev->timer); + mod_timer(&qdev->timer, jiffies + (5*HZ)); netif_device_attach(ndev); } @@ -4871,8 +4869,7 @@ static int qlge_resume(struct pci_dev *pdev) return err; } - qdev->timer.expires = jiffies + (5*HZ); - add_timer(&qdev->timer); + mod_timer(&qdev->timer, jiffies + (5*HZ)); netif_device_attach(ndev); return 0; |