* [PATCH 001/001] vlan: don't call ndo_vlan_rx_register on hardware that doesn't have vlan support
@ 2011-06-16 20:47 Antoine Reversat
2011-06-17 4:13 ` David Miller
0 siblings, 1 reply; 4+ messages in thread
From: Antoine Reversat @ 2011-06-16 20:47 UTC (permalink / raw)
To: netdev
This patch removes the call to ndo_vlan_rx_register if the underlying
device doesn't have hardware support for VLAN.
Signed-off-by: Antoine Reversat <a.reversat@gmail.com>
---
--- linux-2.6.39/net/8021q/vlan.c 2011-05-19 00:06:34.000000000 -0400
+++ linux-2.6.39-fixed/net/8021q/vlan.c 2011-06-16 16:39:25.933742004 -0400
@@ -211,7 +211,7 @@ int register_vlan_dev(struct net_device
grp->nr_vlans++;
if (ngrp) {
- if (ops->ndo_vlan_rx_register)
+ if (ops->ndo_vlan_rx_register && (real_dev->features & NETIF_F_HW_VLAN_RX))
ops->ndo_vlan_rx_register(real_dev, ngrp);
rcu_assign_pointer(real_dev->vlgrp, ngrp);
}
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH 001/001] vlan: don't call ndo_vlan_rx_register on hardware that doesn't have vlan support
2011-06-16 20:47 [PATCH 001/001] vlan: don't call ndo_vlan_rx_register on hardware that doesn't have vlan support Antoine Reversat
@ 2011-06-17 4:13 ` David Miller
2011-06-17 19:00 ` Stephen Hemminger
0 siblings, 1 reply; 4+ messages in thread
From: David Miller @ 2011-06-17 4:13 UTC (permalink / raw)
To: a.reversat; +Cc: netdev
From: Antoine Reversat <a.reversat@gmail.com>
Date: Thu, 16 Jun 2011 16:47:13 -0400
> This patch removes the call to ndo_vlan_rx_register if the underlying
> device doesn't have hardware support for VLAN.
> Signed-off-by: Antoine Reversat <a.reversat@gmail.com>
Applied, thanks.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 001/001] vlan: don't call ndo_vlan_rx_register on hardware that doesn't have vlan support
2011-06-17 4:13 ` David Miller
@ 2011-06-17 19:00 ` Stephen Hemminger
2011-06-17 19:11 ` David Miller
0 siblings, 1 reply; 4+ messages in thread
From: Stephen Hemminger @ 2011-06-17 19:00 UTC (permalink / raw)
To: David Miller; +Cc: a.reversat, netdev
On Fri, 17 Jun 2011 00:13:10 -0400 (EDT)
David Miller <davem@davemloft.net> wrote:
> From: Antoine Reversat <a.reversat@gmail.com>
> Date: Thu, 16 Jun 2011 16:47:13 -0400
>
> > This patch removes the call to ndo_vlan_rx_register if the underlying
> > device doesn't have hardware support for VLAN.
> > Signed-off-by: Antoine Reversat <a.reversat@gmail.com>
>
> Applied, thanks.
Need same check for unregister?
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 001/001] vlan: don't call ndo_vlan_rx_register on hardware that doesn't have vlan support
2011-06-17 19:00 ` Stephen Hemminger
@ 2011-06-17 19:11 ` David Miller
0 siblings, 0 replies; 4+ messages in thread
From: David Miller @ 2011-06-17 19:11 UTC (permalink / raw)
To: shemminger; +Cc: a.reversat, netdev
From: Stephen Hemminger <shemminger@vyatta.com>
Date: Fri, 17 Jun 2011 12:00:32 -0700
> On Fri, 17 Jun 2011 00:13:10 -0400 (EDT)
> David Miller <davem@davemloft.net> wrote:
>
>> From: Antoine Reversat <a.reversat@gmail.com>
>> Date: Thu, 16 Jun 2011 16:47:13 -0400
>>
>> > This patch removes the call to ndo_vlan_rx_register if the underlying
>> > device doesn't have hardware support for VLAN.
>> > Signed-off-by: Antoine Reversat <a.reversat@gmail.com>
>>
>> Applied, thanks.
>
> Need same check for unregister?
What unregister? There is only ->ndo_vlan_rx_register(), no such
->ndo_vlan_rx_unregister() op exists.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-06-17 19:11 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-06-16 20:47 [PATCH 001/001] vlan: don't call ndo_vlan_rx_register on hardware that doesn't have vlan support Antoine Reversat
2011-06-17 4:13 ` David Miller
2011-06-17 19:00 ` Stephen Hemminger
2011-06-17 19:11 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox