1 files changed, 16 insertions, 19 deletions

diff --git a/drivers/net/qlcnic/qlcnic_main.c b/drivers/net/qlcnic/qlcnic_main.c
index e9e9ba6efc5..6e619514fee 100644
--- a/drivers/net/qlcnic/qlcnic_main.c
+++ b/drivers/net/qlcnic/qlcnic_main.c
@@ -328,6 +328,8 @@ static const struct net_device_ops qlcnic_netdev_ops = {
         .ndo_set_multicast_list = qlcnic_set_multi,
         .ndo_set_mac_address    = qlcnic_set_mac,
         .ndo_change_mtu    = qlcnic_change_mtu,
+        .ndo_fix_features  = qlcnic_fix_features,
+        .ndo_set_features  = qlcnic_set_features,
         .ndo_tx_timeout    = qlcnic_tx_timeout,
         .ndo_vlan_rx_add_vid    = qlcnic_vlan_rx_add,
         .ndo_vlan_rx_kill_vid   = qlcnic_vlan_rx_del,
@@ -764,7 +766,7 @@ qlcnic_set_netdev_features(struct qlcnic_adapter *adapter,
         struct net_device *netdev = adapter->netdev;
         unsigned long features, vlan_features;
 
-        features = (NETIF_F_SG | NETIF_F_IP_CSUM |
+        features = (NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_RXCSUM |
                         NETIF_F_IPV6_CSUM | NETIF_F_GRO);
         vlan_features = (NETIF_F_SG | NETIF_F_IP_CSUM |
                         NETIF_F_IPV6_CSUM | NETIF_F_HW_VLAN_FILTER);
@@ -779,14 +781,12 @@ qlcnic_set_netdev_features(struct qlcnic_adapter *adapter,
 
         if (esw_cfg->offload_flags & BIT_0) {
                 netdev->features |= features;
-                adapter->rx_csum = 1;
                 if (!(esw_cfg->offload_flags & BIT_1))
                         netdev->features &= ~NETIF_F_TSO;
                 if (!(esw_cfg->offload_flags & BIT_2))
                         netdev->features &= ~NETIF_F_TSO6;
         } else {
                 netdev->features &= ~features;
-                adapter->rx_csum = 0;
         }
 
         netdev->vlan_features = (features & vlan_features);
@@ -1436,7 +1436,6 @@ qlcnic_setup_netdev(struct qlcnic_adapter *adapter,
         int err;
         struct pci_dev *pdev = adapter->pdev;
 
-        adapter->rx_csum = 1;
         adapter->mc_enabled = 0;
         adapter->max_mc_count = 38;
 
@@ -1447,26 +1446,24 @@ qlcnic_setup_netdev(struct qlcnic_adapter *adapter,
 
         SET_ETHTOOL_OPS(netdev, &qlcnic_ethtool_ops);
 
-        netdev->features |= (NETIF_F_SG | NETIF_F_IP_CSUM |
-                NETIF_F_IPV6_CSUM | NETIF_F_GRO | NETIF_F_HW_VLAN_RX);
-        netdev->vlan_features |= (NETIF_F_SG | NETIF_F_IP_CSUM |
-                NETIF_F_IPV6_CSUM | NETIF_F_HW_VLAN_FILTER);
+        netdev->hw_features = NETIF_F_SG | NETIF_F_IP_CSUM |
+                NETIF_F_IPV6_CSUM | NETIF_F_RXCSUM;
 
-        if (adapter->capabilities & QLCNIC_FW_CAPABILITY_TSO) {
-                netdev->features |= (NETIF_F_TSO | NETIF_F_TSO6);
-                netdev->vlan_features |= (NETIF_F_TSO | NETIF_F_TSO6);
-        }
+        if (adapter->capabilities & QLCNIC_FW_CAPABILITY_TSO)
+                netdev->hw_features |= NETIF_F_TSO | NETIF_F_TSO6;
+        if (pci_using_dac)
+                netdev->hw_features |= NETIF_F_HIGHDMA;
 
-        if (pci_using_dac) {
-                netdev->features |= NETIF_F_HIGHDMA;
-                netdev->vlan_features |= NETIF_F_HIGHDMA;
-        }
+        netdev->vlan_features = netdev->hw_features;
 
         if (adapter->capabilities & QLCNIC_FW_CAPABILITY_FVLANTX)
-                netdev->features |= (NETIF_F_HW_VLAN_TX);
-
+                netdev->hw_features |= NETIF_F_HW_VLAN_TX;
         if (adapter->capabilities & QLCNIC_FW_CAPABILITY_HW_LRO)
-                netdev->features |= NETIF_F_LRO;
+                netdev->hw_features |= NETIF_F_LRO;
+
+        netdev->features |= netdev->hw_features |
+                NETIF_F_HW_VLAN_RX | NETIF_F_HW_VLAN_FILTER;
+
         netdev->irq = adapter->msix_entries[0].vector;
 
         netif_carrier_off(netdev);