i40e: update features with right offload

Orabug: 22342532

Synchronize code bases and add SCTP offload support.

Change-ID: I9f99071f7176225479026930c387bf681a47494e
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
(cherry picked from commit 5afdaaa0555257f3c42b141908567d40aca0e1d1)
Signed-off-by: Brian Maly <brian.maly@oracle.com>
Conflicts:
	drivers/net/ethernet/intel/i40e/i40e_main.c

diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index f10ac51f0ce965dbbab828cb1e559f562c0298ad..340ecd942029a9b1178081c0a5a69658d576b49b 100644 (file)
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -8889,10 +8889,10 @@ 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_RXCSUM         |
-                                 NETIF_F_GSO_UDP_TUNNEL |
-                                 NETIF_F_TSO;
+       netdev->hw_enc_features |= NETIF_F_IP_CSUM        |
+                                  NETIF_F_GSO_UDP_TUNNEL |
+                                  NETIF_F_TSO            |
+                                  0;
 
        netdev->features = NETIF_F_SG                  |
                           NETIF_F_IP_CSUM             |