be2net: fix failure case in setting flow control

When the FW cmd to set flow control fails, the adapter state must simply
reflect the old values.

Signed-off-by: Kalesh AP <kalesh.purayil@emulex.com>
Signed-off-by: Sathya Perla <sathya.perla@emulex.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/emulex/benet/be_ethtool.c b/drivers/net/ethernet/emulex/benet/be_ethtool.c
index 32c53bc0e07ad966c9f3ce1a3644c01353c55ee1..4d2de47007692a85e1477da07b98402b489bc312 100644 (file)
--- a/drivers/net/ethernet/emulex/benet/be_ethtool.c
+++ b/drivers/net/ethernet/emulex/benet/be_ethtool.c
@@ -705,15 +705,17 @@ be_set_pauseparam(struct net_device *netdev, struct ethtool_pauseparam *ecmd)
 
        if (ecmd->autoneg != adapter->phy.fc_autoneg)
                return -EINVAL;
-       adapter->tx_fc = ecmd->tx_pause;
-       adapter->rx_fc = ecmd->rx_pause;
 
-       status = be_cmd_set_flow_control(adapter,
-                                        adapter->tx_fc, adapter->rx_fc);
-       if (status)
+       status = be_cmd_set_flow_control(adapter, ecmd->tx_pause,
+                                        ecmd->rx_pause);
+       if (status) {
                dev_warn(&adapter->pdev->dev, "Pause param set failed\n");
+               return be_cmd_status(status);
+       }
 
-       return be_cmd_status(status);
+       adapter->tx_fc = ecmd->tx_pause;
+       adapter->rx_fc = ecmd->rx_pause;
+       return 0;
 }
 
 static int be_set_phys_id(struct net_device *netdev,

diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
index c40d7efa24c28605a9faa8e536965c1036107a98..f5ac35ccc57e86d2f26dba63ef2b8648f0e66954 100644 (file)
--- a/drivers/net/ethernet/emulex/benet/be_main.c
+++ b/drivers/net/ethernet/emulex/benet/be_main.c
@@ -3667,7 +3667,6 @@ int be_update_queues(struct be_adapter *adapter)
 static int be_setup(struct be_adapter *adapter)
 {
        struct device *dev = &adapter->pdev->dev;
-       u32 tx_fc, rx_fc;
        int status;
 
        be_setup_init(adapter);
@@ -3717,11 +3716,14 @@ static int be_setup(struct be_adapter *adapter)
 
        be_cmd_get_acpi_wol_cap(adapter);
 
-       be_cmd_get_flow_control(adapter, &tx_fc, &rx_fc);
+       status = be_cmd_set_flow_control(adapter, adapter->tx_fc,
+                                        adapter->rx_fc);
+       if (status)
+               be_cmd_get_flow_control(adapter, &adapter->tx_fc,
+                                       &adapter->rx_fc);
 
-       if (rx_fc != adapter->rx_fc || tx_fc != adapter->tx_fc)
-               be_cmd_set_flow_control(adapter, adapter->tx_fc,
-                                       adapter->rx_fc);
+       dev_info(&adapter->pdev->dev, "HW Flow control - TX:%d RX:%d\n",
+                adapter->tx_fc, adapter->rx_fc);
 
        if (be_physfn(adapter))
                be_cmd_set_logical_link_config(adapter,