diff options
| author | Shreyas Bhatewara <sbhatewara@vmware.com> | 2011-07-20 13:21:51 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-07-21 23:39:47 -0400 |
| commit | ebbf9295b17ed605f31f45d9269adb216be3a181 (patch) | |
| tree | 24506b50f9660326012ba6aa5de588c7822fa1a8 /drivers/net/vmxnet3 | |
| parent | e101e7ddad7a16ada030d6d1f044381924bcc0c1 (diff) | |
vmxnet3: fix publicity of NETIF_F_HIGHDMA
NETIF_F_HIGHDMA is being disabled even when dma64 is true. This patch fixes it.
CC: Michal Miroslaw <mirq-linux@rere.qmqm.pl>
Signed-off-by: Shreyas N 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_drv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/vmxnet3/vmxnet3_drv.c b/drivers/net/vmxnet3/vmxnet3_drv.c index 1a8cc5bf06b..1cbacb38965 100644 --- a/drivers/net/vmxnet3/vmxnet3_drv.c +++ b/drivers/net/vmxnet3/vmxnet3_drv.c | |||
| @@ -2647,7 +2647,7 @@ vmxnet3_declare_features(struct vmxnet3_adapter *adapter, bool dma64) | |||
| 2647 | NETIF_F_HW_VLAN_RX | NETIF_F_TSO | NETIF_F_TSO6 | | 2647 | NETIF_F_HW_VLAN_RX | NETIF_F_TSO | NETIF_F_TSO6 | |
| 2648 | NETIF_F_LRO; | 2648 | NETIF_F_LRO; |
| 2649 | if (dma64) | 2649 | if (dma64) |
| 2650 | netdev->features |= NETIF_F_HIGHDMA; | 2650 | netdev->hw_features |= NETIF_F_HIGHDMA; |
| 2651 | netdev->vlan_features = netdev->hw_features & | 2651 | netdev->vlan_features = netdev->hw_features & |
| 2652 | ~(NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX); | 2652 | ~(NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX); |
| 2653 | netdev->features = netdev->hw_features | NETIF_F_HW_VLAN_FILTER; | 2653 | netdev->features = netdev->hw_features | NETIF_F_HW_VLAN_FILTER; |