aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorDavid Miller <davem@davemloft.net>2007-10-31 19:35:57 -0400
committerJeff Garzik <jeff@garzik.org>2007-11-05 17:55:09 -0500
commitcacd40e07c5ad7068221b3910098f1d364e74e45 (patch)
treebf75d6313aac137076fa781dcab31bda997efc85 /drivers
parentb55d1b1814c52463c11707f53dbdc223e09b2924 (diff)
SUNHME: Fix missing NETIF_F_VLAN_CHALLENGED on PCI happy meals
No HME parts can do VLANs correctly. Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/sunhme.c4
1 files changed, 2 insertions, 2 deletions
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,
3143 dev->irq = pdev->irq; 3143 dev->irq = pdev->irq;
3144 dev->dma = 0; 3144 dev->dma = 0;
3145 3145
3146 /* Happy Meal can do it all... */ 3146 /* Happy Meal can do it all... except VLAN. */
3147 dev->features |= NETIF_F_SG | NETIF_F_HW_CSUM; 3147 dev->features |= NETIF_F_SG | NETIF_F_HW_CSUM | NETIF_F_VLAN_CHALLENGED;
3148 3148
3149#if defined(CONFIG_SBUS) && defined(CONFIG_PCI) 3149#if defined(CONFIG_SBUS) && defined(CONFIG_PCI)
3150 /* Hook up PCI register/dma accessors. */ 3150 /* Hook up PCI register/dma accessors. */