diff options
| author | David Miller <davem@davemloft.net> | 2007-11-01 00:35:57 +0100 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-11-05 23:55:09 +0100 |
| commit | cacd40e07c5ad7068221b3910098f1d364e74e45 (patch) | |
| tree | bf75d6313aac137076fa781dcab31bda997efc85 /drivers/net | |
| parent | Merge branch 'drm-patches' of master.kernel.org:/pub/scm/linux/kernel/git/air... (diff) | |
| download | linux-cacd40e07c5ad7068221b3910098f1d364e74e45.tar.xz linux-cacd40e07c5ad7068221b3910098f1d364e74e45.zip | |
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/net')
| -rw-r--r-- | drivers/net/sunhme.c | 4 |
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, 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. */ |