| Message ID | 1313649471-31555-1-git-send-email-jpirko@redhat.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Jiri Pirko <jpirko@redhat.com> Date: Thu, 18 Aug 2011 08:37:51 +0200 > 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> Applied, thanks. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c index e55df30..6d5fbd4 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);
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> --- drivers/net/forcedeth.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)