openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Breno Leitao 2010-07-01 03:00:17 +00:00 committed by David S. Miller
parent 0dacca73a3
commit 72046d84f0
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/net/qlge/qlge_main.c
View File

@ -4611,8 +4611,7 @@ static void ql_timer(unsigned long data)
return; return;
} }
qdev->timer.expires = jiffies + (5*HZ); mod_timer(&qdev->timer, jiffies + (5*HZ));
add_timer(&qdev->timer);
} }
static int __devinit qlge_probe(struct pci_dev *pdev, 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, netif_err(qdev, ifup, qdev->ndev,
"Device was not running prior to EEH.\n"); "Device was not running prior to EEH.\n");
} }
qdev->timer.expires = jiffies + (5*HZ); mod_timer(&qdev->timer, jiffies + (5*HZ));
add_timer(&qdev->timer);
netif_device_attach(ndev); netif_device_attach(ndev);
} }
@ -4871,8 +4869,7 @@ static int qlge_resume(struct pci_dev *pdev)
return err; return err;
} }
qdev->timer.expires = jiffies + (5*HZ); mod_timer(&qdev->timer, jiffies + (5*HZ));
add_timer(&qdev->timer);
netif_device_attach(ndev); netif_device_attach(ndev);
return 0; return 0;