From: Allan, Bruce W <bruce.w.allan@intel.com>
Date: Mon, 11 Apr 2011 13:01:59 +0000 (+0000)
Subject: ethtool: time to blink provided in seconds not jiffies
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=143780c6562080c1117cd9197ee1b33c0d838376;p=mv-sheeva.git

ethtool: time to blink provided in seconds not jiffies

When blinking for a duration set by the user, the value specified is in
seconds but it is used as the number of jiffies in the timeout after which
the Physical ID indicator is deactivated.  Fix by converting the timeout
to seconds.

Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Acked-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/core/ethtool.c b/net/core/ethtool.c
index 704e176ad3a..43ef09fedd6 100644
--- a/net/core/ethtool.c
+++ b/net/core/ethtool.c
@@ -1653,7 +1653,7 @@ static int ethtool_phys_id(struct net_device *dev, void __user *useraddr)
 	if (rc == 0) {
 		/* Driver will handle this itself */
 		schedule_timeout_interruptible(
-			id.data ? id.data : MAX_SCHEDULE_TIMEOUT);
+			id.data ? (id.data * HZ) : MAX_SCHEDULE_TIMEOUT);
 	} else {
 		/* Driver expects to be called periodically */
 		do {