]> git.karo-electronics.de Git - karo-tx-linux.git/commit
vmxnet3: Fix inconsistent LRO state after initialization
authorThomas Jarosch <thomas.jarosch@intra2net.com>
Mon, 16 May 2011 06:28:15 +0000 (06:28 +0000)
committerGreg Kroah-Hartman <gregkh@suse.de>
Sat, 21 May 2011 22:13:34 +0000 (15:13 -0700)
commit67de934b0b0c242cb95ce97c78fc6e0ca4e904f7
tree47ef53d131d25ac301aed53e0cb0afa5824e63d0
parent9f5cc5c89537184cf45a7e069330c85428a7fc09
vmxnet3: Fix inconsistent LRO state after initialization

commit ebde6f8acba92abfc203585198a54f47e83e2cd0 upstream.

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/net/vmxnet3/vmxnet3_ethtool.c