diff options
author | James Bottomley | 2016-07-06 16:25:55 +0200 |
---|---|---|
committer | James Bottomley | 2016-07-06 16:25:55 +0200 |
commit | ea1a25c3348abc33d7d94db28501766adf3d1c7d (patch) | |
tree | ca3c5c8b72532117034dd2d57a2a85eead13db7b /drivers/net/ethernet/intel/i40evf/i40evf_main.c | |
parent | SCSI: fix new bug in scsi_dev_info_list string matching (diff) | |
parent | qla2xxx: Fix NULL pointer deref in QLA interrupt (diff) | |
download | kernel-qcow2-linux-ea1a25c3348abc33d7d94db28501766adf3d1c7d.tar.gz kernel-qcow2-linux-ea1a25c3348abc33d7d94db28501766adf3d1c7d.tar.xz kernel-qcow2-linux-ea1a25c3348abc33d7d94db28501766adf3d1c7d.zip |
Merge branch 'jejb-fixes' into fixes
Diffstat (limited to 'drivers/net/ethernet/intel/i40evf/i40evf_main.c')
-rw-r--r-- | drivers/net/ethernet/intel/i40evf/i40evf_main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/intel/i40evf/i40evf_main.c b/drivers/net/ethernet/intel/i40evf/i40evf_main.c index 642bb45ed906..16c552952860 100644 --- a/drivers/net/ethernet/intel/i40evf/i40evf_main.c +++ b/drivers/net/ethernet/intel/i40evf/i40evf_main.c @@ -2230,8 +2230,8 @@ int i40evf_process_config(struct i40evf_adapter *adapter) NETIF_F_TSO6 | NETIF_F_GSO_GRE | NETIF_F_GSO_GRE_CSUM | - NETIF_F_GSO_IPIP | - NETIF_F_GSO_SIT | + NETIF_F_GSO_IPXIP4 | + NETIF_F_GSO_IPXIP6 | NETIF_F_GSO_UDP_TUNNEL | NETIF_F_GSO_UDP_TUNNEL_CSUM | NETIF_F_GSO_PARTIAL | |