aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/benet/be_main.c
diff options
context:
space:
mode:
authorMichał Mirosław <mirq-linux@rere.qmqm.pl>2011-04-07 22:38:47 -0400
committerDavid S. Miller <davem@davemloft.net>2011-04-10 21:55:18 -0400
commit8b8ddc68df13032a5666438b48dfb7a86de3a610 (patch)
tree8a2b12b3480ea5ab7586fa76e23bf6eb18472e5c /drivers/net/benet/be_main.c
parent4e01d2d1cac683477b539b40b7b4662d6a9c436f (diff)
net: benet: convert to hw_features - fixup
Fix up after merge with NETIF_F_RXHASH implementation. This allows to toggle NETIF_F_RXHASH and NETIF_F_HW_VLAN_TX. Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/benet/be_main.c')
-rw-r--r--drivers/net/benet/be_main.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/net/benet/be_main.c b/drivers/net/benet/be_main.c
index 58a652f81862..289c73aa6875 100644
--- a/drivers/net/benet/be_main.c
+++ b/drivers/net/benet/be_main.c
@@ -2629,14 +2629,13 @@ static void be_netdev_init(struct net_device *netdev)
2629 int i; 2629 int i;
2630 2630
2631 netdev->hw_features |= NETIF_F_SG | NETIF_F_TSO | NETIF_F_TSO6 | 2631 netdev->hw_features |= NETIF_F_SG | NETIF_F_TSO | NETIF_F_TSO6 |
2632 NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM | NETIF_F_RXCSUM; 2632 NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM | NETIF_F_RXCSUM |
2633 NETIF_F_HW_VLAN_TX;
2634 if (be_multi_rxq(adapter))
2635 netdev->hw_features |= NETIF_F_RXHASH;
2633 2636
2634 netdev->features |= netdev->hw_features | 2637 netdev->features |= netdev->hw_features |
2635 NETIF_F_HW_VLAN_RX | NETIF_F_HW_VLAN_TX | 2638 NETIF_F_HW_VLAN_RX | NETIF_F_HW_VLAN_FILTER;
2636 NETIF_F_HW_VLAN_FILTER;
2637
2638 if (be_multi_rxq(adapter))
2639 netdev->features |= NETIF_F_RXHASH;
2640 2639
2641 netdev->vlan_features |= NETIF_F_SG | NETIF_F_TSO | 2640 netdev->vlan_features |= NETIF_F_SG | NETIF_F_TSO |
2642 NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM; 2641 NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM;