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

Commit 283a21d3 authored by Stephen Hemminger's avatar Stephen Hemminger Committed by David S. Miller
Browse files

pcnet32: round off carrier watch timer 



The link check watchdog timer on this driver fires every two seconds, but
since not aligned it causes extra wakeups. It is more important on this
driver than most because it is the hardware that is emulated by default
when using network interfaces on VMware.

Signed-off-by: default avatarStephen Hemminger <shemminger@vyatta.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9fd7a1d9

drivers/net/pcnet32.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -2282,7 +2282,7 @@ static int pcnet32_open(struct net_device *dev) 
	if (lp->chip_version >= PCNET32_79C970A) {

	if (lp->chip_version >= PCNET32_79C970A) {

		/* Print the link status and start the watchdog */

		/* Print the link status and start the watchdog */

		pcnet32_check_media(dev, 1);

		pcnet32_check_media(dev, 1);

		mod_timer(&(lp->watchdog_timer), PCNET32_WATCHDOG_TIMEOUT);

		mod_timer(&lp->watchdog_timer, PCNET32_WATCHDOG_TIMEOUT);

	}

	}





	i = 0;

	i = 0;
@@ -2917,7 +2917,7 @@ static void pcnet32_watchdog(struct net_device *dev) 
	pcnet32_check_media(dev, 0);

	pcnet32_check_media(dev, 0);

	spin_unlock_irqrestore(&lp->lock, flags);

	spin_unlock_irqrestore(&lp->lock, flags);





	mod_timer(&(lp->watchdog_timer), PCNET32_WATCHDOG_TIMEOUT);

	mod_timer(&lp->watchdog_timer, round_jiffies(PCNET32_WATCHDOG_TIMEOUT));

}

}





static int pcnet32_pm_suspend(struct pci_dev *pdev, pm_message_t state)

static int pcnet32_pm_suspend(struct pci_dev *pdev, pm_message_t state)