From 15ec5f4a4b31152678d84495f6fbf125ccd33c42 Mon Sep 17 00:00:00 2001 From: Shreyas Bhatewara Date: Thu, 15 Jul 2010 22:17:29 -0700 Subject: [PATCH] --- yaml --- r: 203612 b: refs/heads/master c: ca802447c0b9dc12a8aa6552c9c7b3c7af31f492 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/vmxnet3/vmxnet3_ethtool.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index cccfa8c6d101..fdfeed4b5c9d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f86586fa48a94c7a9c7f36650a2e0e4a947881c9 +refs/heads/master: ca802447c0b9dc12a8aa6552c9c7b3c7af31f492 diff --git a/trunk/drivers/net/vmxnet3/vmxnet3_ethtool.c b/trunk/drivers/net/vmxnet3/vmxnet3_ethtool.c index de1ba148171e..7e4b5a89165a 100644 --- a/trunk/drivers/net/vmxnet3/vmxnet3_ethtool.c +++ b/trunk/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); }