Commit 3dd7400b authored by Ronak Doshi's avatar Ronak Doshi Committed by David S. Miller

vmxnet3: turn off lro when rxcsum is disabled

Currently, when rx csum is disabled, vmxnet3 driver does not turn
off lro, which can cause performance issues if user does not turn off
lro explicitly. This patch adds fix_features support which is used to
turn off LRO whenever RXCSUM is disabled.
Signed-off-by: default avatarRonak Doshi <doshir@vmware.com>
Acked-by: default avatarRishi Mehta <rmehta@vmware.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9ec49a7e
...@@ -3247,6 +3247,7 @@ vmxnet3_probe_device(struct pci_dev *pdev, ...@@ -3247,6 +3247,7 @@ vmxnet3_probe_device(struct pci_dev *pdev,
.ndo_start_xmit = vmxnet3_xmit_frame, .ndo_start_xmit = vmxnet3_xmit_frame,
.ndo_set_mac_address = vmxnet3_set_mac_addr, .ndo_set_mac_address = vmxnet3_set_mac_addr,
.ndo_change_mtu = vmxnet3_change_mtu, .ndo_change_mtu = vmxnet3_change_mtu,
.ndo_fix_features = vmxnet3_fix_features,
.ndo_set_features = vmxnet3_set_features, .ndo_set_features = vmxnet3_set_features,
.ndo_get_stats64 = vmxnet3_get_stats64, .ndo_get_stats64 = vmxnet3_get_stats64,
.ndo_tx_timeout = vmxnet3_tx_timeout, .ndo_tx_timeout = vmxnet3_tx_timeout,
......
...@@ -257,6 +257,16 @@ vmxnet3_get_strings(struct net_device *netdev, u32 stringset, u8 *buf) ...@@ -257,6 +257,16 @@ vmxnet3_get_strings(struct net_device *netdev, u32 stringset, u8 *buf)
} }
} }
netdev_features_t vmxnet3_fix_features(struct net_device *netdev,
netdev_features_t features)
{
/* If Rx checksum is disabled, then LRO should also be disabled */
if (!(features & NETIF_F_RXCSUM))
features &= ~NETIF_F_LRO;
return features;
}
int vmxnet3_set_features(struct net_device *netdev, netdev_features_t features) int vmxnet3_set_features(struct net_device *netdev, netdev_features_t features)
{ {
struct vmxnet3_adapter *adapter = netdev_priv(netdev); struct vmxnet3_adapter *adapter = netdev_priv(netdev);
......
...@@ -69,12 +69,12 @@ ...@@ -69,12 +69,12 @@
/* /*
* Version numbers * Version numbers
*/ */
#define VMXNET3_DRIVER_VERSION_STRING "1.4.16.0-k" #define VMXNET3_DRIVER_VERSION_STRING "1.4.17.0-k"
/* Each byte of this 32-bit integer encodes a version number in /* Each byte of this 32-bit integer encodes a version number in
* VMXNET3_DRIVER_VERSION_STRING. * VMXNET3_DRIVER_VERSION_STRING.
*/ */
#define VMXNET3_DRIVER_VERSION_NUM 0x01041000 #define VMXNET3_DRIVER_VERSION_NUM 0x01041100
#if defined(CONFIG_PCI_MSI) #if defined(CONFIG_PCI_MSI)
/* RSS only makes sense if MSI-X is supported. */ /* RSS only makes sense if MSI-X is supported. */
...@@ -454,6 +454,9 @@ vmxnet3_tq_destroy_all(struct vmxnet3_adapter *adapter); ...@@ -454,6 +454,9 @@ vmxnet3_tq_destroy_all(struct vmxnet3_adapter *adapter);
void void
vmxnet3_rq_destroy_all(struct vmxnet3_adapter *adapter); vmxnet3_rq_destroy_all(struct vmxnet3_adapter *adapter);
netdev_features_t
vmxnet3_fix_features(struct net_device *netdev, netdev_features_t features);
int int
vmxnet3_set_features(struct net_device *netdev, netdev_features_t features); vmxnet3_set_features(struct net_device *netdev, netdev_features_t features);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment