diff options
author | Shahed Shaikh <shahed.shaikh@qlogic.com> | 2014-01-28 11:55:30 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-01-28 14:59:30 -0500 |
commit | 092dfcf347241576a98d3b1bb4b9b98e0faeb801 (patch) | |
tree | 6f022775a11f09715d6bcf84c60197900036d431 | |
parent | 060d0564a9152f210183aebad41c41794e18f419 (diff) |
qlcnic: Fix loopback test failure
Driver was returning from link event handler without
setting linkup variable
Signed-off-by: Shahed Shaikh <shahed.shaikh@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c index 19e1a93bac67..54ebf300332a 100644 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c | |||
@@ -683,12 +683,17 @@ void qlcnic_advert_link_change(struct qlcnic_adapter *adapter, int linkup) | |||
683 | adapter->ahw->linkup = 0; | 683 | adapter->ahw->linkup = 0; |
684 | netif_carrier_off(netdev); | 684 | netif_carrier_off(netdev); |
685 | } else if (!adapter->ahw->linkup && linkup) { | 685 | } else if (!adapter->ahw->linkup && linkup) { |
686 | /* Do not advertise Link up if the port is in loopback mode */ | 686 | adapter->ahw->linkup = 1; |
687 | if (qlcnic_83xx_check(adapter) && adapter->ahw->lb_mode) | 687 | |
688 | /* Do not advertise Link up to the stack if device | ||
689 | * is in loopback mode | ||
690 | */ | ||
691 | if (qlcnic_83xx_check(adapter) && adapter->ahw->lb_mode) { | ||
692 | netdev_info(netdev, "NIC Link is up for loopback test\n"); | ||
688 | return; | 693 | return; |
694 | } | ||
689 | 695 | ||
690 | netdev_info(netdev, "NIC Link is up\n"); | 696 | netdev_info(netdev, "NIC Link is up\n"); |
691 | adapter->ahw->linkup = 1; | ||
692 | netif_carrier_on(netdev); | 697 | netif_carrier_on(netdev); |
693 | } | 698 | } |
694 | } | 699 | } |