]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
SUNHME: Fix missing NETIF_F_VLAN_CHALLENGED on PCI happy meals
authorDavid Miller <davem@davemloft.net>
Wed, 31 Oct 2007 23:35:57 +0000 (16:35 -0700)
committerJeff Garzik <jeff@garzik.org>
Mon, 5 Nov 2007 22:55:09 +0000 (17:55 -0500)
No HME parts can do VLANs correctly.

Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
drivers/net/sunhme.c

index 120c8affe83dba36f29f972657fc05954af6284d..c20a3bd21bb25c4c63ba301c8be5345d885b86d9 100644 (file)
@@ -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. */