* [patch net-2.6] forcedeth: call vlan_mode only if hw supports vlans
@ 2011-08-18 6:37 Jiri Pirko
2011-08-18 6:50 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Jiri Pirko @ 2011-08-18 6:37 UTC (permalink / raw)
To: netdev; +Cc: davem, mirqus, mingo, torvalds, akpm
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(-)
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);
--
1.7.6
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [patch net-2.6] forcedeth: call vlan_mode only if hw supports vlans
2011-08-18 6:37 [patch net-2.6] forcedeth: call vlan_mode only if hw supports vlans Jiri Pirko
@ 2011-08-18 6:50 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2011-08-18 6:50 UTC (permalink / raw)
To: jpirko; +Cc: netdev, mirqus, mingo, torvalds, akpm
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.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-08-18 6:50 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-08-18 6:37 [patch net-2.6] forcedeth: call vlan_mode only if hw supports vlans Jiri Pirko
2011-08-18 6:50 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).