Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke...

[karo-tx-linux.git] / drivers / net / vmxnet3 / vmxnet3_ethtool.c

diff --git a/drivers/net/vmxnet3/vmxnet3_ethtool.c b/drivers/net/vmxnet3/vmxnet3_ethtool.c
index de1ba148171eea8f57817cbe30ecc83f2380be9f..7e4b5a89165a5804dcb68dd78d225163ea71efd7 100644 (file)
--- 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);
        }