From 8f71d4a917f7164e5f88f0619c6344571aaef15d Mon Sep 17 00:00:00 2001 From: Vasanthy Kolluri Date: Thu, 18 Mar 2010 16:19:54 +0000 Subject: [PATCH] --- yaml --- r: 193621 b: refs/heads/master c: 73c1ea9b54eb4794b7413ceb2250ad7957dfcc91 h: refs/heads/master i: 193619: 084caf7c80d374888090851aac63542c0997cd06 v: v3 --- [refs] | 2 +- trunk/drivers/net/enic/enic_main.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 3808340638a0..b5d27cf5cd1b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b6d24eb663cdf4af9c08b37ad2e31056c5eb2561 +refs/heads/master: 73c1ea9b54eb4794b7413ceb2250ad7957dfcc91 diff --git a/trunk/drivers/net/enic/enic_main.c b/trunk/drivers/net/enic/enic_main.c index cf098bb636b8..18c043a3f461 100644 --- a/trunk/drivers/net/enic/enic_main.c +++ b/trunk/drivers/net/enic/enic_main.c @@ -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))