diff options
| author | Sathya Perla | 2011-08-02 21:57:42 +0200 |
|---|---|---|
| committer | David S. Miller | 2011-08-03 12:23:29 +0200 |
| commit | ea172a011d1435d9bd167265bf51cc64d026b4e7 (patch) | |
| tree | 66b4988065a7f51973a9705a4321beed701c6374 /drivers/net/benet/be_ethtool.c | |
| parent | be2net: remove wrong and unnecessary calls to netif_carrier_off() (diff) | |
| download | kernel-qcow2-linux-ea172a011d1435d9bd167265bf51cc64d026b4e7.tar.gz kernel-qcow2-linux-ea172a011d1435d9bd167265bf51cc64d026b4e7.tar.xz kernel-qcow2-linux-ea172a011d1435d9bd167265bf51cc64d026b4e7.zip | |
be2net: no need to query link status
Change in the link status generates an MCC event. This is processed and
netif_carrier_on/off is called accordingly. Don't need to query/store the
link_status state.
Signed-off-by: Sathya Perla <sathya.perla@emulex.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/benet/be_ethtool.c')
| -rw-r--r-- | drivers/net/benet/be_ethtool.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/net/benet/be_ethtool.c b/drivers/net/benet/be_ethtool.c index e92a8d8813a0..60c85f6fad51 100644 --- a/drivers/net/benet/be_ethtool.c +++ b/drivers/net/benet/be_ethtool.c @@ -353,15 +353,13 @@ static int be_get_settings(struct net_device *netdev, struct ethtool_cmd *ecmd) struct be_cmd_resp_get_phy_info *resp; u8 mac_speed = 0; u16 link_speed = 0; - bool link_up = false; int status; u16 intf_type; if ((adapter->link_speed < 0) || (!(netdev->flags & IFF_UP))) { - status = be_cmd_link_status_query(adapter, &link_up, - &mac_speed, &link_speed, 0); + status = be_cmd_link_status_query(adapter, &mac_speed, + &link_speed, 0); - be_link_status_update(adapter, link_up); /* link_speed is in units of 10 Mbps */ if (link_speed) { ethtool_cmd_speed_set(ecmd, link_speed*10); @@ -617,7 +615,6 @@ static void be_self_test(struct net_device *netdev, struct ethtool_test *test, u64 *data) { struct be_adapter *adapter = netdev_priv(netdev); - bool link_up; u8 mac_speed = 0; u16 qos_link_speed = 0; @@ -643,7 +640,7 @@ be_self_test(struct net_device *netdev, struct ethtool_test *test, u64 *data) test->flags |= ETH_TEST_FL_FAILED; } - if (be_cmd_link_status_query(adapter, &link_up, &mac_speed, + if (be_cmd_link_status_query(adapter, &mac_speed, &qos_link_speed, 0) != 0) { test->flags |= ETH_TEST_FL_FAILED; data[4] = -1; |