summaryrefslogtreecommitdiffstats
path: root/net/core
diff options
context:
space:
mode:
authorAllan, Bruce W <bruce.w.allan@intel.com>2011-04-11 13:01:59 +0000
committerDavid S. Miller <davem@davemloft.net>2011-04-12 13:47:33 -0700
commit143780c6562080c1117cd9197ee1b33c0d838376 (patch)
tree2c917395174066a85ea138377993e3a0fd45e7fb /net/core
parent6ba1037c3d871ab70e342631516dbf841c35b086 (diff)
downloadop-kernel-dev-143780c6562080c1117cd9197ee1b33c0d838376.zip
op-kernel-dev-143780c6562080c1117cd9197ee1b33c0d838376.tar.gz
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>
Diffstat (limited to 'net/core')
-rw-r--r--net/core/ethtool.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/ethtool.c b/net/core/ethtool.c
index 704e176..43ef09f 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 {
OpenPOWER on IntegriCloud