3 files changed, 25 insertions, 1 deletions

diff --git a/drivers/net/qlcnic/qlcnic.h b/drivers/net/qlcnic/qlcnic.h
index 7f4e11bd4cd..f6b887d409d 100644
--- a/drivers/net/qlcnic/qlcnic.h
+++ b/drivers/net/qlcnic/qlcnic.h
@@ -894,6 +894,7 @@ struct qlcnic_mac_req {
 #define QLCNIC_MSI_ENABLED              0x02
 #define QLCNIC_MSIX_ENABLED             0x04
 #define QLCNIC_LRO_ENABLED              0x08
+#define QLCNIC_LRO_DISABLED             0x00
 #define QLCNIC_BRIDGE_ENABLED           0X10
 #define QLCNIC_DIAG_ENABLED             0x20
 #define QLCNIC_ESWITCH_ENABLED          0x40
diff --git a/drivers/net/qlcnic/qlcnic_ethtool.c b/drivers/net/qlcnic/qlcnic_ethtool.c
index 3d4655dce4b..e38fc3d96d4 100644
--- a/drivers/net/qlcnic/qlcnic_ethtool.c
+++ b/drivers/net/qlcnic/qlcnic_ethtool.c
@@ -818,7 +818,21 @@ static u32 qlcnic_get_rx_csum(struct net_device *dev)
 static int qlcnic_set_rx_csum(struct net_device *dev, u32 data)
 {
         struct qlcnic_adapter *adapter = netdev_priv(dev);
+
+        if (!!data) {
+                adapter->rx_csum = !!data;
+                return 0;
+        }
+
+        if (adapter->flags & QLCNIC_LRO_ENABLED) {
+                if (qlcnic_config_hw_lro(adapter, QLCNIC_LRO_DISABLED))
+                        return -EIO;
+
+                dev->features &= ~NETIF_F_LRO;
+                qlcnic_send_lro_cleanup(adapter);
+        }
         adapter->rx_csum = !!data;
+        dev_info(&adapter->pdev->dev, "disabling LRO as rx_csum is off\n");
         return 0;
 }
 
@@ -1001,6 +1015,15 @@ static int qlcnic_set_flags(struct net_device *netdev, u32 data)
         if (!(adapter->capabilities & QLCNIC_FW_CAPABILITY_HW_LRO))
                 return -EINVAL;
 
+        if (!adapter->rx_csum) {
+                dev_info(&adapter->pdev->dev, "rx csum is off, "
+                        "cannot toggle lro\n");
+                return -EINVAL;
+        }
+
+        if ((data & ETH_FLAG_LRO) && (adapter->flags & QLCNIC_LRO_ENABLED))
+                return 0;
+
         if (data & ETH_FLAG_LRO) {
                 hw_lro = QLCNIC_LRO_ENABLED;
                 netdev->features |= NETIF_F_LRO;
diff --git a/drivers/net/qlcnic/qlcnic_main.c b/drivers/net/qlcnic/qlcnic_main.c
index bf4077a1e82..abd7cd6db6f 100644
--- a/drivers/net/qlcnic/qlcnic_main.c
+++ b/drivers/net/qlcnic/qlcnic_main.c
@@ -995,7 +995,7 @@ __qlcnic_up(struct qlcnic_adapter *adapter, struct net_device *netdev)
 
         qlcnic_config_intr_coalesce(adapter);
 
-        if (adapter->capabilities & QLCNIC_FW_CAPABILITY_HW_LRO)
+        if (netdev->features & NETIF_F_LRO)
                 qlcnic_config_hw_lro(adapter, QLCNIC_LRO_ENABLED);
 
         qlcnic_napi_enable(adapter);