]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
enic: Do not advertise NETIF_F_HW_VLAN_RX
authorVasanthy Kolluri <vkolluri@cisco.com>
Thu, 18 Mar 2010 16:19:54 +0000 (16:19 +0000)
committerDavid S. Miller <davem@davemloft.net>
Fri, 19 Mar 2010 04:22:48 +0000 (21:22 -0700)
Hardware does not honor vlan filters from the host and so the driver does
not need to advertise this.

Signed-off-by: Scott Feldman <scofeldm@cisco.com>
Signed-off-by: Vasanthy Kolluri <vkolluri@cisco.com>
Signed-off-by: Roopa Prabhu <roprabhu@cisco.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/enic/enic_main.c

index cf098bb636b802a48e0187218744e6461173d4ec..18c043a3f4617574b81d1275a135c8b618adc121 100644 (file)
@@ -2058,8 +2058,7 @@ static int __devinit enic_probe(struct pci_dev *pdev,
        netdev->watchdog_timeo = 2 * HZ;
        netdev->ethtool_ops = &enic_ethtool_ops;
 
-       netdev->features |= NETIF_F_HW_VLAN_TX |
-               NETIF_F_HW_VLAN_RX | NETIF_F_HW_VLAN_FILTER;
+       netdev->features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX;
        if (ENIC_SETTING(enic, TXCSUM))
                netdev->features |= NETIF_F_SG | NETIF_F_HW_CSUM;
        if (ENIC_SETTING(enic, TSO))