From: David Miller Date: Wed, 31 Oct 2007 23:35:57 +0000 (-0700) Subject: SUNHME: Fix missing NETIF_F_VLAN_CHALLENGED on PCI happy meals X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=cacd40e07c5ad7068221b3910098f1d364e74e45;p=deliverable%2Flinux.git SUNHME: Fix missing NETIF_F_VLAN_CHALLENGED on PCI happy meals No HME parts can do VLANs correctly. Signed-off-by: David S. Miller Signed-off-by: Jeff Garzik --- diff --git a/drivers/net/sunhme.c b/drivers/net/sunhme.c index 120c8affe83d..c20a3bd21bb2 100644 --- a/drivers/net/sunhme.c +++ b/drivers/net/sunhme.c @@ -3143,8 +3143,8 @@ static int __devinit happy_meal_pci_probe(struct pci_dev *pdev, dev->irq = pdev->irq; dev->dma = 0; - /* Happy Meal can do it all... */ - dev->features |= NETIF_F_SG | NETIF_F_HW_CSUM; + /* Happy Meal can do it all... except VLAN. */ + dev->features |= NETIF_F_SG | NETIF_F_HW_CSUM | NETIF_F_VLAN_CHALLENGED; #if defined(CONFIG_SBUS) && defined(CONFIG_PCI) /* Hook up PCI register/dma accessors. */