aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorDon Skidmore <donald.c.skidmore@intel.com>2009-07-02 08:50:52 -0400
committerDavid S. Miller <davem@davemloft.net>2009-07-03 22:11:05 -0400
commit5da43c1a78cbc16518017dfb058da6ec4829781b (patch)
tree039a95aaedc5624904affa67ef1dfe8ed8b525ad /drivers/net
parent19343de279d28e4ed039c8ad00510d19dc4d6d12 (diff)
ixgbe: fix inconsistent SFP/SFP+ failure results.
Currently if we loaded the driver, insert an unsupported module, and then attempt to "ifconfig up" the device it will be brought down but the netdev would not be unregistered. This behavior is different than all other code paths. This patch corrects that by down'ing the device and then scheduling the sfp_config_module_task tasklet. The tasklet will detect this condition (like it does with other code paths) and do the unregister_netdev(). I also removed the log message as this condition (an unsupported SFP+ module) will be logged in sfp_config_module_task. Signed-off-by: Don Skidmore <donald.c.skidmore@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/ixgbe/ixgbe_main.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index cf39f5a47037..a3061aacffd8 100644
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
@@ -2706,12 +2706,12 @@ static int ixgbe_up_complete(struct ixgbe_adapter *adapter)
2706 if (hw->phy.type == ixgbe_phy_unknown) { 2706 if (hw->phy.type == ixgbe_phy_unknown) {
2707 err = hw->phy.ops.identify(hw); 2707 err = hw->phy.ops.identify(hw);
2708 if (err == IXGBE_ERR_SFP_NOT_SUPPORTED) { 2708 if (err == IXGBE_ERR_SFP_NOT_SUPPORTED) {
2709 dev_err(&adapter->pdev->dev, "failed to initialize " 2709 /*
2710 "because an unsupported SFP+ module type " 2710 * Take the device down and schedule the sfp tasklet
2711 "was detected.\n" 2711 * which will unregister_netdev and log it.
2712 "Reload the driver after installing a " 2712 */
2713 "supported module.\n");
2714 ixgbe_down(adapter); 2713 ixgbe_down(adapter);
2714 schedule_work(&adapter->sfp_config_module_task);
2715 return err; 2715 return err;
2716 } 2716 }
2717 } 2717 }