diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2010-10-21 14:05:32 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-10-24 18:52:31 -0400 |
commit | 3843e5154cdcab15fa7405f175e9a1626030792d (patch) | |
tree | d197c27df158c3f57df997b048ac88a691467df0 /drivers/net/vmxnet3/vmxnet3_ethtool.c | |
parent | 19ecae2c8fd5e54e40ace914a41d8e1beb41612c (diff) |
vmxnet3: remove set_flag_le{16,64} helpers
It's easier to just annotate the constants as little endian types and set/clear
the flags directly.
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Shreyas Bhatewara <sbhatewara@vmware.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/vmxnet3/vmxnet3_ethtool.c')
-rw-r--r-- | drivers/net/vmxnet3/vmxnet3_ethtool.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/drivers/net/vmxnet3/vmxnet3_ethtool.c b/drivers/net/vmxnet3/vmxnet3_ethtool.c index 7e4b5a89165a..b79070bcc92e 100644 --- a/drivers/net/vmxnet3/vmxnet3_ethtool.c +++ b/drivers/net/vmxnet3/vmxnet3_ethtool.c | |||
@@ -50,13 +50,11 @@ vmxnet3_set_rx_csum(struct net_device *netdev, u32 val) | |||
50 | adapter->rxcsum = val; | 50 | adapter->rxcsum = val; |
51 | if (netif_running(netdev)) { | 51 | if (netif_running(netdev)) { |
52 | if (val) | 52 | if (val) |
53 | set_flag_le64( | 53 | adapter->shared->devRead.misc.uptFeatures |= |
54 | &adapter->shared->devRead.misc.uptFeatures, | 54 | UPT1_F_RXCSUM; |
55 | UPT1_F_RXCSUM); | ||
56 | else | 55 | else |
57 | reset_flag_le64( | 56 | adapter->shared->devRead.misc.uptFeatures &= |
58 | &adapter->shared->devRead.misc.uptFeatures, | 57 | ~UPT1_F_RXCSUM; |
59 | UPT1_F_RXCSUM); | ||
60 | 58 | ||
61 | VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD, | 59 | VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD, |
62 | VMXNET3_CMD_UPDATE_FEATURE); | 60 | VMXNET3_CMD_UPDATE_FEATURE); |
@@ -292,10 +290,10 @@ vmxnet3_set_flags(struct net_device *netdev, u32 data) | |||
292 | /* update harware LRO capability accordingly */ | 290 | /* update harware LRO capability accordingly */ |
293 | if (lro_requested) | 291 | if (lro_requested) |
294 | adapter->shared->devRead.misc.uptFeatures |= | 292 | adapter->shared->devRead.misc.uptFeatures |= |
295 | cpu_to_le64(UPT1_F_LRO); | 293 | UPT1_F_LRO; |
296 | else | 294 | else |
297 | adapter->shared->devRead.misc.uptFeatures &= | 295 | adapter->shared->devRead.misc.uptFeatures &= |
298 | cpu_to_le64(~UPT1_F_LRO); | 296 | ~UPT1_F_LRO; |
299 | VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD, | 297 | VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD, |
300 | VMXNET3_CMD_UPDATE_FEATURE); | 298 | VMXNET3_CMD_UPDATE_FEATURE); |
301 | } | 299 | } |