Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 72046d84 authored by Breno Leitao's avatar Breno Leitao Committed by David S. Miller
Browse files

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: default avatarBreno Leitao <leitao@linux.vnet.ibm.com>
Signed-off-by: default avatarRon Mercer <ron.mercer@qlogic.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0dacca73

drivers/net/qlge/qlge_main.c

+3 −6
Original line number Diff line number Diff line
@@ -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;