Home » Mailing list archives » linux-netdev » 2008 » December » 12

[PATCH 05/33] sfc: Correct interpretation of second param to ethtool phys_id()

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Ben Hutchings
Subject: [PATCH 05/33] sfc: Correct interpretation of second param to ethtool phys_id()
Date: Friday, December 12, 2008 - 5:49 am

A value of 0 means indefinite repetition (until interrupted).

Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
---
 drivers/net/sfc/ethtool.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/net/sfc/ethtool.c b/drivers/net/sfc/ethtool.c
index cd92c4d..9c533e0 100644
--- a/drivers/net/sfc/ethtool.c
+++ b/drivers/net/sfc/ethtool.c
@@ -182,12 +182,16 @@ static struct efx_ethtool_stat efx_ethtool_stats[] = {
  */
 
 /* Identify device by flashing LEDs */
-static int efx_ethtool_phys_id(struct net_device *net_dev, u32 seconds)
+static int efx_ethtool_phys_id(struct net_device *net_dev, u32 count)
 {
 	struct efx_nic *efx = netdev_priv(net_dev);
 
 	efx->board_info.blink(efx, 1);
-	schedule_timeout_interruptible(seconds * HZ);
+	set_current_state(TASK_INTERRUPTIBLE);
+	if (count)
+		schedule_timeout(count * HZ);
+	else
+		schedule();
 	efx->board_info.blink(efx, 0);
 	return 0;
 }
-- 
Ben Hutchings, Senior Software Engineer, Solarflare Communications
Not speaking for my employer; that's the marketing department's job.
They asked us to note that Solarflare product names are trademarked.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
[PATCH 00/33] sfc version 2.3, Ben Hutchings, (Fri Dec 12, 5:46 am)
[PATCH 01/33] sfc: Board support fixes, Ben Hutchings, (Fri Dec 12, 5:48 am)
[PATCH 02/33] sfc: Change SPI lengths to type size_t, Ben Hutchings, (Fri Dec 12, 5:48 am)
[PATCH 03/33] sfc: Do not use pci_disable_device() to disa ..., Ben Hutchings, (Fri Dec 12, 5:49 am)
[PATCH 04/33] sfc: Remove unneeded register write, Ben Hutchings, (Fri Dec 12, 5:49 am)
[PATCH 05/33] sfc: Correct interpretation of second param ..., Ben Hutchings, (Fri Dec 12, 5:49 am)
[PATCH 06/33] sfc: Make reset_workqueue driver-global rath ..., Ben Hutchings, (Fri Dec 12, 5:50 am)
[PATCH 07/33] sfc: Clean up waits for flash/EEPROM operations, Ben Hutchings, (Fri Dec 12, 5:51 am)
[PATCH 08/33] sfc: Work around unreliable strap pins, Ben Hutchings, (Fri Dec 12, 5:51 am)
[PATCH 09/33] sfc: Restore phy_flash_cfg module parameter, Ben Hutchings, (Fri Dec 12, 5:51 am)
[PATCH 13/33] sfc: Don't count RX checksum errors during l ..., Ben Hutchings, (Fri Dec 12, 5:53 am)
[PATCH 14/33] sfc: Remove MII extension cruft, Ben Hutchings, (Fri Dec 12, 5:53 am)
[PATCH 15/33] sfc: Add support for MMDs numbered &gt;15, Ben Hutchings, (Fri Dec 12, 5:53 am)
[PATCH 16/33] sfc: Add phy_type device attribute, Ben Hutchings, (Fri Dec 12, 5:54 am)
[PATCH 17/33] sfc: Clean up board identification, Ben Hutchings, (Fri Dec 12, 5:54 am)
[PATCH 18/33] sfc: Clean up MDIO flag setting, Ben Hutchings, (Fri Dec 12, 5:54 am)
[PATCH 19/33] sfc: Add support for sub-10G speeds, Ben Hutchings, (Fri Dec 12, 5:54 am)
[PATCH 20/33] sfc: Implement auto-negotiation, Ben Hutchings, (Fri Dec 12, 5:55 am)
[PATCH 21/33] sfc: Rework MAC, PHY and board event handling, Ben Hutchings, (Fri Dec 12, 5:55 am)
[PATCH 22/33] sfc: Add support for Solarflare 10Xpress SFT9001, Ben Hutchings, (Fri Dec 12, 5:56 am)
[PATCH 23/33] sfc: Add support for SFN4111T, Ben Hutchings, (Fri Dec 12, 5:56 am)
[PATCH 25/33] sfc: Generate unique names for per-NIC workq ..., Ben Hutchings, (Fri Dec 12, 5:56 am)
[PATCH 26/33] sfc: Remove leading spaces, Ben Hutchings, (Fri Dec 12, 5:57 am)
[PATCH 27/33] sfc: Specify a meaningful component for loop ..., Ben Hutchings, (Fri Dec 12, 5:57 am)
[PATCH 28/33] sfc: Use mutex_lock_interruptible() for etht ..., Ben Hutchings, (Fri Dec 12, 5:59 am)
[PATCH 29/33] sfc: Use model numbers for PHY type names, Ben Hutchings, (Fri Dec 12, 5:59 am)
[PATCH 30/33] sfc: Treat probe as unsuccessful if it sched ..., Ben Hutchings, (Fri Dec 12, 6:00 am)
[PATCH 31/33] sfc: Use kzalloc() to ensure struct efx_spi_ ..., Ben Hutchings, (Fri Dec 12, 6:00 am)
Re: [PATCH 01/33] sfc: Board support fixes, David Miller, (Fri Dec 12, 10:29 pm)
Re: [PATCH 02/33] sfc: Change SPI lengths to type size_t, David Miller, (Fri Dec 12, 10:30 pm)
Re: [PATCH 03/33] sfc: Do not use pci_disable_device() to ..., David Miller, (Fri Dec 12, 10:31 pm)
Re: [PATCH 04/33] sfc: Remove unneeded register write, David Miller, (Fri Dec 12, 10:31 pm)
Re: [PATCH 05/33] sfc: Correct interpretation of second pa ..., David Miller, (Fri Dec 12, 10:32 pm)
Re: [PATCH 06/33] sfc: Make reset_workqueue driver-global ..., David Miller, (Fri Dec 12, 10:33 pm)
Re: [PATCH 07/33] sfc: Clean up waits for flash/EEPROM ope ..., David Miller, (Fri Dec 12, 10:33 pm)
Re: [PATCH 08/33] sfc: Work around unreliable strap pins, David Miller, (Fri Dec 12, 10:34 pm)
Re: [PATCH 09/33] sfc: Restore phy_flash_cfg module parameter, David Miller, (Fri Dec 12, 10:35 pm)
Re: [PATCH 13/33] sfc: Don't count RX checksum errors duri ..., David Miller, (Fri Dec 12, 10:42 pm)
Re: [PATCH 14/33] sfc: Remove MII extension cruft, David Miller, (Fri Dec 12, 10:43 pm)
Re: [PATCH 15/33] sfc: Add support for MMDs numbered &gt;15, David Miller, (Fri Dec 12, 10:44 pm)
Re: [PATCH 16/33] sfc: Add phy_type device attribute, David Miller, (Fri Dec 12, 10:47 pm)
Re: [PATCH 17/33] sfc: Clean up board identification, David Miller, (Fri Dec 12, 10:48 pm)
Re: [PATCH 18/33] sfc: Clean up MDIO flag setting, David Miller, (Fri Dec 12, 10:49 pm)
Re: [PATCH 19/33] sfc: Add support for sub-10G speeds, David Miller, (Fri Dec 12, 10:50 pm)
Re: [PATCH 20/33] sfc: Implement auto-negotiation, David Miller, (Fri Dec 12, 10:50 pm)
Re: [PATCH 02/33] sfc: Change SPI lengths to type size_t, David Miller, (Fri Dec 12, 10:53 pm)
Re: [PATCH 21/33] sfc: Rework MAC, PHY and board event han ..., David Miller, (Fri Dec 12, 10:59 pm)
Re: [PATCH 22/33] sfc: Add support for Solarflare 10Xpress ..., David Miller, (Fri Dec 12, 11:00 pm)
Re: [PATCH 23/33] sfc: Add support for SFN4111T, David Miller, (Fri Dec 12, 11:01 pm)
Re: [PATCH 25/33] sfc: Generate unique names for per-NIC w ..., David Miller, (Fri Dec 12, 11:04 pm)
Re: [PATCH 26/33] sfc: Remove leading spaces, David Miller, (Fri Dec 12, 11:05 pm)
Re: [PATCH 27/33] sfc: Specify a meaningful component for ..., David Miller, (Fri Dec 12, 11:05 pm)
Re: [PATCH 28/33] sfc: Use mutex_lock_interruptible() for ..., David Miller, (Fri Dec 12, 11:06 pm)
Re: [PATCH 29/33] sfc: Use model numbers for PHY type names, David Miller, (Fri Dec 12, 11:07 pm)
Re: [PATCH 30/33] sfc: Treat probe as unsuccessful if it s ..., David Miller, (Fri Dec 12, 11:08 pm)
Re: [PATCH 31/33] sfc: Use kzalloc() to ensure struct efx_ ..., David Miller, (Fri Dec 12, 11:09 pm)
Re: [PATCH 25/33] sfc: Generate unique names for per-NIC w ..., Ben Hutchings, (Fri Dec 12, 11:23 pm)
Re: [PATCH 03/33] sfc: Do not use pci_disable_device() to ..., Ben Hutchings, (Fri Dec 12, 11:27 pm)
Re: [PATCH 25/33] sfc: Generate unique names for per-NIC w ..., David Miller, (Fri Dec 12, 11:29 pm)
Re: [PATCH 02/33] sfc: Change SPI lengths to type size_t, Ben Hutchings, (Fri Dec 12, 11:30 pm)
Re: [PATCH 25/33] sfc: Generate unique names for per-NIC w ..., Ben Hutchings, (Sat Dec 13, 7:01 am)