diff options
| author | Jiri Pirko <jpirko@redhat.com> | 2011-08-18 08:50:37 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-08-18 08:50:37 +0200 |
| commit | 9331db4f00cfee8a79d2147ac83723ef436b9759 (patch) | |
| tree | c504e38c405b70d4eb86e2f6de8239e62d86d731 | |
| parent | via-velocity: remove non-tagged packet filtering (diff) | |
| download | linux-9331db4f00cfee8a79d2147ac83723ef436b9759.tar.xz linux-9331db4f00cfee8a79d2147ac83723ef436b9759.zip | |
forcedeth: call vlan_mode only if hw supports vlans
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>
| -rw-r--r-- | drivers/net/forcedeth.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c index e55df308a3af..6d5fbd4d4256 100644 --- a/drivers/net/forcedeth.c +++ b/drivers/net/forcedeth.c @@ -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); |