Commit a56b158a authored by Ronak Doshi's avatar Ronak Doshi Committed by David S. Miller
Browse files

vmxnet3: disable overlay offloads if UPT device does not support 



'Commit 6f91f4ba ("vmxnet3: add support for capability registers")'
added support for capability registers. These registers are used
to advertize capabilities of the device.

The patch updated the dev_caps to disable outer checksum offload if
PTCR register does not support it. However, it missed to update
other overlay offloads. This patch fixes this issue.

Fixes: 6f91f4ba ("vmxnet3: add support for capability registers")
Signed-off-by: default avatarRonak Doshi <doshir@vmware.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6f9d7046

drivers/net/vmxnet3/vmxnet3_drv.c

+8 −1
Original line number Diff line number Diff line
@@ -3365,10 +3365,17 @@ vmxnet3_declare_features(struct vmxnet3_adapter *adapter) 
		adapter->dev_caps[0] = VMXNET3_READ_BAR1_REG(adapter, VMXNET3_REG_CMD);

		spin_unlock_irqrestore(&adapter->cmd_lock, flags);



		if (!(adapter->dev_caps[0] & (1UL << VMXNET3_CAP_GENEVE_CHECKSUM_OFFLOAD)) &&

		    !(adapter->dev_caps[0] & (1UL << VMXNET3_CAP_VXLAN_CHECKSUM_OFFLOAD)) &&

		    !(adapter->dev_caps[0] & (1UL << VMXNET3_CAP_GENEVE_TSO)) &&

		    !(adapter->dev_caps[0] & (1UL << VMXNET3_CAP_VXLAN_TSO))) {

			netdev->hw_enc_features &= ~NETIF_F_GSO_UDP_TUNNEL;

			netdev->hw_features &= ~NETIF_F_GSO_UDP_TUNNEL;

		}

		if (!(adapter->dev_caps[0] & (1UL << VMXNET3_CAP_GENEVE_OUTER_CHECKSUM_OFFLOAD)) &&

		    !(adapter->dev_caps[0] & (1UL << VMXNET3_CAP_VXLAN_OUTER_CHECKSUM_OFFLOAD))) {

			netdev->hw_enc_features &= ~NETIF_F_GSO_UDP_TUNNEL_CSUM;

			netdev->features &= ~NETIF_F_GSO_UDP_TUNNEL_CSUM;

			netdev->hw_features &= ~NETIF_F_GSO_UDP_TUNNEL_CSUM;

		}

	}

drivers/net/vmxnet3/vmxnet3_ethtool.c

+6 −0
Original line number Diff line number Diff line
@@ -346,6 +346,12 @@ static void vmxnet3_enable_encap_offloads(struct net_device *netdev, netdev_feat 
		adapter->dev_caps[0] = VMXNET3_READ_BAR1_REG(adapter, VMXNET3_REG_CMD);

		spin_unlock_irqrestore(&adapter->cmd_lock, flags);



		if (!(adapter->dev_caps[0] & (1UL << VMXNET3_CAP_GENEVE_CHECKSUM_OFFLOAD)) &&

		    !(adapter->dev_caps[0] & (1UL << VMXNET3_CAP_VXLAN_CHECKSUM_OFFLOAD)) &&

		    !(adapter->dev_caps[0] & (1UL << VMXNET3_CAP_GENEVE_TSO)) &&

		    !(adapter->dev_caps[0] & (1UL << VMXNET3_CAP_VXLAN_TSO))) {

			netdev->hw_enc_features &= ~NETIF_F_GSO_UDP_TUNNEL;

		}

		if (!(adapter->dev_caps[0] & (1UL << VMXNET3_CAP_GENEVE_OUTER_CHECKSUM_OFFLOAD)) &&

		    !(adapter->dev_caps[0] & (1UL << VMXNET3_CAP_VXLAN_OUTER_CHECKSUM_OFFLOAD))) {

			netdev->hw_enc_features &= ~NETIF_F_GSO_UDP_TUNNEL_CSUM;