From 96f39919eb8c0bb08e843fd259c4711934bae351 Mon Sep 17 00:00:00 2001 From: Shreyas Bhatewara Date: Wed, 20 Jul 2011 17:21:51 +0000 Subject: [PATCH] --- yaml --- r: 256604 b: refs/heads/master c: ebbf9295b17ed605f31f45d9269adb216be3a181 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/vmxnet3/vmxnet3_drv.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 65d4a10d4111..62e44ae9054b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e101e7ddad7a16ada030d6d1f044381924bcc0c1 +refs/heads/master: ebbf9295b17ed605f31f45d9269adb216be3a181 diff --git a/trunk/drivers/net/vmxnet3/vmxnet3_drv.c b/trunk/drivers/net/vmxnet3/vmxnet3_drv.c index 1a8cc5bf06bb..1cbacb389652 100644 --- a/trunk/drivers/net/vmxnet3/vmxnet3_drv.c +++ b/trunk/drivers/net/vmxnet3/vmxnet3_drv.c @@ -2647,7 +2647,7 @@ vmxnet3_declare_features(struct vmxnet3_adapter *adapter, bool dma64) NETIF_F_HW_VLAN_RX | NETIF_F_TSO | NETIF_F_TSO6 | NETIF_F_LRO; if (dma64) - netdev->features |= NETIF_F_HIGHDMA; + netdev->hw_features |= NETIF_F_HIGHDMA; netdev->vlan_features = netdev->hw_features & ~(NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX); netdev->features = netdev->hw_features | NETIF_F_HW_VLAN_FILTER;