[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20110413195938.25901.96213.stgit@gitlad.jf.intel.com>
Date: Wed, 13 Apr 2011 12:59:38 -0700
From: Bruce Allan <bruce.w.allan@...el.com>
To: netdev@...r.kernel.org
Cc: Bruce Allan <bruce.w.allan@...el.com>,
Solarflare linux maintainers <linux-net-drivers@...arflare.com>,
Steve Hodgson <shodgson@...arflare.com>,
Ben Hutchings <bhutchings@...arflare.com>
Subject: [net-next-2.6 RFC PATCH v2 10/13] sfc: set ethtool set_phys_id on/off
cycle frequency to 1/sec
Physical identification frequency based on how it was done prior to the
introduction of set_phys_id. Compile tested only.
Also fixed the compile warning re. "mode" may be used uninitialized.
Signed-off-by: Bruce Allan <bruce.w.allan@...el.com>
Cc: Solarflare linux maintainers <linux-net-drivers@...arflare.com>
Cc: Steve Hodgson <shodgson@...arflare.com>
Cc: Ben Hutchings <bhutchings@...arflare.com>
---
drivers/net/sfc/ethtool.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/sfc/ethtool.c b/drivers/net/sfc/ethtool.c
index 644f7c1..5d8468f 100644
--- a/drivers/net/sfc/ethtool.c
+++ b/drivers/net/sfc/ethtool.c
@@ -182,7 +182,7 @@ static int efx_ethtool_phys_id(struct net_device *net_dev,
enum ethtool_phys_id_state state)
{
struct efx_nic *efx = netdev_priv(net_dev);
- enum efx_led_mode mode;
+ enum efx_led_mode mode = EFX_LED_DEFAULT;
switch (state) {
case ETHTOOL_ID_ON:
@@ -194,8 +194,8 @@ static int efx_ethtool_phys_id(struct net_device *net_dev,
case ETHTOOL_ID_INACTIVE:
mode = EFX_LED_DEFAULT;
break;
- default:
- return -EINVAL;
+ case ETHTOOL_ID_ACTIVE:
+ return 1; /* cycle on/off once per second */
}
efx->type->set_id_led(efx, mode);
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists