]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
i40e: Update feature flags to reflect newly enabled features
authorAlexander Duyck <aduyck@mirantis.com>
Mon, 25 Jan 2016 05:17:50 +0000 (21:17 -0800)
committerChuck Anderson <chuck.anderson@oracle.com>
Thu, 10 Mar 2016 16:37:42 +0000 (08:37 -0800)
Orabug: 22342532

Recent changes should have enabled support for IPv6 based tunnels and
support for TSO with outer UDP checksums.  As such we can update the
feature flags to reflect that.

In addition we can clean-up the flags that aren't needed such as SCTP and
RXCSUM since having the bits there doesn't add any value.

Signed-off-by: Alexander Duyck <aduyck@mirantis.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
(cherry picked from commit bc5d252b363cca63b7ddc1e20dd8b8b242631006)
Signed-off-by: Brian Maly <brian.maly@oracle.com>
Conflicts:
drivers/net/ethernet/intel/i40e/i40e_main.c

drivers/net/ethernet/intel/i40e/i40e_main.c

index e18fa88cde147c72b1f4683a055315c0d005569a..d66866d3576bb0dc47f687eed21a7372b01e022d 100644 (file)
@@ -8973,9 +8973,13 @@ static int i40e_config_netdev(struct i40e_vsi *vsi)
        np = netdev_priv(netdev);
        np->vsi = vsi;
 
-       netdev->hw_enc_features |= NETIF_F_IP_CSUM        |
-                                  NETIF_F_GSO_UDP_TUNNEL |
-                                  NETIF_F_TSO            |
+       netdev->hw_enc_features |= NETIF_F_IP_CSUM             |
+                                  NETIF_F_IPV6_CSUM           |
+                                  NETIF_F_TSO                 |
+                                  NETIF_F_TSO6                |
+                                  NETIF_F_TSO_ECN             |
+                                  NETIF_F_GSO_UDP_TUNNEL      |
+                                  NETIF_F_GSO_UDP_TUNNEL_CSUM |
                                   0;
 
        netdev->features = NETIF_F_SG                  |
@@ -8996,6 +9000,8 @@ static int i40e_config_netdev(struct i40e_vsi *vsi)
 
        if (!(pf->flags & I40E_FLAG_MFP_ENABLED))
                netdev->features |= NETIF_F_NTUPLE;
+       if (pf->flags & I40E_FLAG_OUTER_UDP_CSUM_CAPABLE)
+               netdev->features |= NETIF_F_GSO_UDP_TUNNEL_CSUM;
 
        /* copy netdev features into list of user selectable features */
        netdev->hw_features |= netdev->features;