diff options
author | Shreyas Bhatewara <sbhatewara@vmware.com> | 2010-07-16 01:17:29 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-07-16 01:17:29 -0400 |
commit | ca802447c0b9dc12a8aa6552c9c7b3c7af31f492 (patch) | |
tree | a8f21bb12e71f5ff74660c34cb8bef7e37830f54 /drivers/net/vmxnet3 | |
parent | f86586fa48a94c7a9c7f36650a2e0e4a947881c9 (diff) |
net-next: fix LRO feature update in vmxnet3
Fix LRO feature update.
Signed-off-by: Shreyas Bhatewara <sbhatewara@vmware.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/vmxnet3')
-rw-r--r-- | drivers/net/vmxnet3/vmxnet3_ethtool.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/vmxnet3/vmxnet3_ethtool.c b/drivers/net/vmxnet3/vmxnet3_ethtool.c index de1ba148171e..7e4b5a89165a 100644 --- a/drivers/net/vmxnet3/vmxnet3_ethtool.c +++ b/drivers/net/vmxnet3/vmxnet3_ethtool.c | |||
@@ -291,10 +291,11 @@ vmxnet3_set_flags(struct net_device *netdev, u32 data) | |||
291 | 291 | ||
292 | /* update harware LRO capability accordingly */ | 292 | /* update harware LRO capability accordingly */ |
293 | if (lro_requested) | 293 | if (lro_requested) |
294 | adapter->shared->devRead.misc.uptFeatures &= UPT1_F_LRO; | 294 | adapter->shared->devRead.misc.uptFeatures |= |
295 | cpu_to_le64(UPT1_F_LRO); | ||
295 | else | 296 | else |
296 | adapter->shared->devRead.misc.uptFeatures &= | 297 | adapter->shared->devRead.misc.uptFeatures &= |
297 | ~UPT1_F_LRO; | 298 | cpu_to_le64(~UPT1_F_LRO); |
298 | VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD, | 299 | VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD, |
299 | VMXNET3_CMD_UPDATE_FEATURE); | 300 | VMXNET3_CMD_UPDATE_FEATURE); |
300 | } | 301 | } |