Commit ebde6f8acba92abfc203585198a54f47e83e2cd0
Committed by
David S. Miller
1 parent
867955f568
Exists in
master
and in
4 other branches
vmxnet3: Fix inconsistent LRO state after initialization
During initialization of vmxnet3, the state of LRO gets out of sync with netdev->features. This leads to very poor TCP performance in a IP forwarding setup and is hitting many VMware users. Simplified call sequence: 1. vmxnet3_declare_features() initializes "adapter->lro" to true. 2. The kernel automatically disables LRO if IP forwarding is enabled, so vmxnet3_set_flags() gets called. This also updates netdev->features. 3. Now vmxnet3_setup_driver_shared() is called. "adapter->lro" is still set to true and LRO gets enabled again, even though netdev->features shows it's disabled. Fix it by updating "adapter->lro", too. The private vmxnet3 adapter flags are scheduled for removal in net-next, see commit a0d2730c9571aeba793cb5d3009094ee1d8fda35 "net: vmxnet3: convert to hw_features". Patch applies to 2.6.37 / 2.6.38 and 2.6.39-rc6. Please CC: comments. Signed-off-by: Thomas Jarosch <thomas.jarosch@intra2net.com> Acked-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Showing 1 changed file with 3 additions and 0 deletions Side-by-side Diff
drivers/net/vmxnet3/vmxnet3_ethtool.c
... | ... | @@ -311,6 +311,9 @@ |
311 | 311 | /* toggle the LRO feature*/ |
312 | 312 | netdev->features ^= NETIF_F_LRO; |
313 | 313 | |
314 | + /* Update private LRO flag */ | |
315 | + adapter->lro = lro_requested; | |
316 | + | |
314 | 317 | /* update harware LRO capability accordingly */ |
315 | 318 | if (lro_requested) |
316 | 319 | adapter->shared->devRead.misc.uptFeatures |= |