aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorBreno Leitao <leitao@linux.vnet.ibm.com>2010-06-30 23:00:17 -0400
committerDavid S. Miller <davem@davemloft.net>2010-07-03 00:59:05 -0400
commit72046d84f0d6e3047f4d5a5173260141983b2b61 (patch)
tree46e3aba833a5d9944938a18c08e5f5d81c5545ff /drivers/net
parent0dacca73a3ddefa6cb8a7e0282f938e01faa1a64 (diff)
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.c9
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)
4611 return; 4611 return;
4612 } 4612 }
4613 4613
4614 qdev->timer.expires = jiffies + (5*HZ); 4614 mod_timer(&qdev->timer, jiffies + (5*HZ));
4615 add_timer(&qdev->timer);
4616} 4615}
4617 4616
4618static int __devinit qlge_probe(struct pci_dev *pdev, 4617static int __devinit qlge_probe(struct pci_dev *pdev,
@@ -4808,8 +4807,7 @@ static void qlge_io_resume(struct pci_dev *pdev)
4808 netif_err(qdev, ifup, qdev->ndev, 4807 netif_err(qdev, ifup, qdev->ndev,
4809 "Device was not running prior to EEH.\n"); 4808 "Device was not running prior to EEH.\n");
4810 } 4809 }
4811 qdev->timer.expires = jiffies + (5*HZ); 4810 mod_timer(&qdev->timer, jiffies + (5*HZ));
4812 add_timer(&qdev->timer);
4813 netif_device_attach(ndev); 4811 netif_device_attach(ndev);
4814} 4812}
4815 4813
@@ -4871,8 +4869,7 @@ static int qlge_resume(struct pci_dev *pdev)
4871 return err; 4869 return err;
4872 } 4870 }
4873 4871
4874 qdev->timer.expires = jiffies + (5*HZ); 4872 mod_timer(&qdev->timer, jiffies + (5*HZ));
4875 add_timer(&qdev->timer);
4876 netif_device_attach(ndev); 4873 netif_device_attach(ndev);
4877 4874
4878 return 0; 4875 return 0;