Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 256604
b: refs/heads/master
c: ebbf929
h: refs/heads/master
v: v3
  • Loading branch information
Shreyas Bhatewara authored and David S. Miller committed Jul 22, 2011
1 parent efd4b81 commit 96f3991
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e101e7ddad7a16ada030d6d1f044381924bcc0c1
refs/heads/master: ebbf9295b17ed605f31f45d9269adb216be3a181
2 changes: 1 addition & 1 deletion trunk/drivers/net/vmxnet3/vmxnet3_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 96f3991

Please sign in to comment.