Skip to content

Commit

Permalink
forcedeth: call vlan_mode only if hw supports vlans
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jiri Pirko authored and David S. Miller committed Aug 18, 2011
1 parent 9a75a97 commit 9331db4
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion drivers/net/forcedeth.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down

0 comments on commit 9331db4

Please sign in to comment.