summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordavid decotigny <david.decotigny@google.com>2011-11-16 12:15:15 +0000
committerDavid S. Miller <davem@davemloft.net>2011-11-16 23:14:03 -0500
commit8f5f69824fe221a36df781c2aee9fa1d74e89077 (patch)
tree648cccab1047e7992d9622a600735460a5cce35e
parent0a1f222d24817bd57545dfb9573b5424db27d1d5 (diff)
downloadlinux-stable-8f5f69824fe221a36df781c2aee9fa1d74e89077.tar.gz
linux-stable-8f5f69824fe221a36df781c2aee9fa1d74e89077.tar.bz2
linux-stable-8f5f69824fe221a36df781c2aee9fa1d74e89077.zip
forcedeth: stats updated with a deferrable timer
Mark stats timer as deferrable: punctuality in waking the stats timer callback doesn't matter much, as it is responsible only to avoid integer wraparound. We need at least 1 other timer to fire within 17s (fully loaded 1Gbps) to avoid wrap-arounds. Desired period is still 10s. Signed-off-by: David Decotigny <david.decotigny@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ethernet/nvidia/forcedeth.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/nvidia/forcedeth.c b/drivers/net/ethernet/nvidia/forcedeth.c
index b34975dca5df..0d8d5c0ab336 100644
--- a/drivers/net/ethernet/nvidia/forcedeth.c
+++ b/drivers/net/ethernet/nvidia/forcedeth.c
@@ -5532,7 +5532,7 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i
init_timer(&np->nic_poll);
np->nic_poll.data = (unsigned long) dev;
np->nic_poll.function = nv_do_nic_poll; /* timer handler */
- init_timer(&np->stats_poll);
+ init_timer_deferrable(&np->stats_poll);
np->stats_poll.data = (unsigned long) dev;
np->stats_poll.function = nv_do_stats_poll; /* timer handler */