summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorShreyas Bhatewara <sbhatewara@vmware.com>2010-07-15 22:17:29 -0700
committerDavid S. Miller <davem@davemloft.net>2010-07-15 22:17:29 -0700
commitca802447c0b9dc12a8aa6552c9c7b3c7af31f492 (patch)
treea8f21bb12e71f5ff74660c34cb8bef7e37830f54 /drivers
parentf86586fa48a94c7a9c7f36650a2e0e4a947881c9 (diff)
downloadlinux-ca802447c0b9dc12a8aa6552c9c7b3c7af31f492.tar.gz
linux-ca802447c0b9dc12a8aa6552c9c7b3c7af31f492.tar.bz2
linux-ca802447c0b9dc12a8aa6552c9c7b3c7af31f492.zip
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')
-rw-r--r--drivers/net/vmxnet3/vmxnet3_ethtool.c5
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)
/* update harware LRO capability accordingly */
if (lro_requested)
- adapter->shared->devRead.misc.uptFeatures &= UPT1_F_LRO;
+ adapter->shared->devRead.misc.uptFeatures |=
+ cpu_to_le64(UPT1_F_LRO);
else
adapter->shared->devRead.misc.uptFeatures &=
- ~UPT1_F_LRO;
+ cpu_to_le64(~UPT1_F_LRO);
VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD,
VMXNET3_CMD_UPDATE_FEATURE);
}