net/ibmvnic: Update carrier state after link state change

Only set the device carrier state to on after receiving an up link
state indication from the underlying adapter. Likewise, if a down
link indication is receieved, update the carrier state accordingly.
This fix ensures that accurate carrier state is reported by the driver
following a link state update by the underlying adapter.

Signed-off-by: Thomas Falcon <tlfalcon@linux.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c
index 2be3bcd0192f990e27332b1331bd27300c154587..3dcd9c3d8781dec039e624c9ac9d32537cca230e 100644 (file)
--- a/drivers/net/ethernet/ibm/ibmvnic.c
+++ b/drivers/net/ethernet/ibm/ibmvnic.c
@@ -1111,7 +1111,6 @@ static int ibmvnic_open(struct net_device *netdev)
        }
 
        rc = __ibmvnic_open(netdev);
        }
 
        rc = __ibmvnic_open(netdev);

-       netif_carrier_on(netdev);

 
        return rc;
 }
 
        return rc;
 }


@@ -1864,8 +1863,6 @@ static int do_reset(struct ibmvnic_adapter *adapter,
            adapter->reset_reason != VNIC_RESET_CHANGE_PARAM)
                call_netdevice_notifiers(NETDEV_NOTIFY_PEERS, netdev);
 
            adapter->reset_reason != VNIC_RESET_CHANGE_PARAM)
                call_netdevice_notifiers(NETDEV_NOTIFY_PEERS, netdev);
 

-       netif_carrier_on(netdev);
-

        return 0;
 }
 
        return 0;
 }
 


@@ -1935,8 +1932,6 @@ static int do_hard_reset(struct ibmvnic_adapter *adapter,
                return 0;
        }
 
                return 0;
        }
 

-       netif_carrier_on(netdev);
-

        return 0;
 }
 
        return 0;
 }
 


@@ -4480,6 +4475,10 @@ static void ibmvnic_handle_crq(union ibmvnic_crq *crq,
                    crq->link_state_indication.phys_link_state;
                adapter->logical_link_state =
                    crq->link_state_indication.logical_link_state;
                    crq->link_state_indication.phys_link_state;
                adapter->logical_link_state =
                    crq->link_state_indication.logical_link_state;

+               if (adapter->phys_link_state && adapter->logical_link_state)
+                       netif_carrier_on(netdev);
+               else
+                       netif_carrier_off(netdev);

                break;
        case CHANGE_MAC_ADDR_RSP:
                netdev_dbg(netdev, "Got MAC address change Response\n");
                break;
        case CHANGE_MAC_ADDR_RSP:
                netdev_dbg(netdev, "Got MAC address change Response\n");