forcedeth: call vlan_mode only if hw supports vlans
authorJiri Pirko <jpirko@redhat.com>
Thu, 18 Aug 2011 06:50:37 +0000 (23:50 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 18 Aug 2011 06:50:37 +0000 (23:50 -0700)
If hw does not support vlans, dont call nv_vlan_mode because it has no point.
I believe that this should fix issues on older non-vlan supportive
chips (like Ingo has).

Reported-ty: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Jiri Pirko <jpirko@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/forcedeth.c

index e55df308a3af219a54beaadc7dfdcd42c9508de8..6d5fbd4d4256ba527ea295030e91c6dd5b7373f6 100644 (file)
@@ -5615,7 +5615,8 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i
                goto out_error;
        }
 
-       nv_vlan_mode(dev, dev->features);
+       if (id->driver_data & DEV_HAS_VLAN)
+               nv_vlan_mode(dev, dev->features);
 
        netif_carrier_off(dev);