Message ID | 20100412221723.8068.75393.stgit@localhost6.localdomain6 |
---|---|
State | Rejected, archived |
Delegated to: | David Miller |
Headers | show |
Chris Leech <christopher.leech@intel.com> wrote: >The checks in the hardware accelerated receive path are not up to date >with what's in netif_receive_skb, which will get called anyway if the >frame is not dropped in the vlan code. > >Signed-off-by: Chris Leech <christopher.leech@intel.com> NAK. As I explained in a reply to Chris's separate message detailing the problem he sees, the skb_bond_should_drop logic as implemented is dependent upon knowing the original skb->dev the packet arrived on, prior to VLAN reassigning it. That's not to say there's nothing wrong here, but removing the calls with break other things. -J >--- > > net/8021q/vlan_core.c | 6 ------ > 1 files changed, 0 insertions(+), 6 deletions(-) > >diff --git a/net/8021q/vlan_core.c b/net/8021q/vlan_core.c >index c584a0a..7576f9c 100644 >--- a/net/8021q/vlan_core.c >+++ b/net/8021q/vlan_core.c >@@ -11,9 +11,6 @@ int __vlan_hwaccel_rx(struct sk_buff *skb, struct vlan_group *grp, > if (netpoll_rx(skb)) > return NET_RX_DROP; > >- if (skb_bond_should_drop(skb, ACCESS_ONCE(skb->dev->master))) >- goto drop; >- > skb->skb_iif = skb->dev->ifindex; > __vlan_hwaccel_put_tag(skb, vlan_tci); > skb->dev = vlan_group_get_device(grp, vlan_tci & VLAN_VID_MASK); >@@ -83,9 +80,6 @@ vlan_gro_common(struct napi_struct *napi, struct vlan_group *grp, > { > struct sk_buff *p; > >- if (skb_bond_should_drop(skb, ACCESS_ONCE(skb->dev->master))) >- goto drop; >- > skb->skb_iif = skb->dev->ifindex; > __vlan_hwaccel_put_tag(skb, vlan_tci); > skb->dev = vlan_group_get_device(grp, vlan_tci & VLAN_VID_MASK); > --- -Jay Vosburgh, IBM Linux Technology Center, fubar@us.ibm.com -- 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/net/8021q/vlan_core.c b/net/8021q/vlan_core.c index c584a0a..7576f9c 100644 --- a/net/8021q/vlan_core.c +++ b/net/8021q/vlan_core.c @@ -11,9 +11,6 @@ int __vlan_hwaccel_rx(struct sk_buff *skb, struct vlan_group *grp, if (netpoll_rx(skb)) return NET_RX_DROP; - if (skb_bond_should_drop(skb, ACCESS_ONCE(skb->dev->master))) - goto drop; - skb->skb_iif = skb->dev->ifindex; __vlan_hwaccel_put_tag(skb, vlan_tci); skb->dev = vlan_group_get_device(grp, vlan_tci & VLAN_VID_MASK); @@ -83,9 +80,6 @@ vlan_gro_common(struct napi_struct *napi, struct vlan_group *grp, { struct sk_buff *p; - if (skb_bond_should_drop(skb, ACCESS_ONCE(skb->dev->master))) - goto drop; - skb->skb_iif = skb->dev->ifindex; __vlan_hwaccel_put_tag(skb, vlan_tci); skb->dev = vlan_group_get_device(grp, vlan_tci & VLAN_VID_MASK);
The checks in the hardware accelerated receive path are not up to date with what's in netif_receive_skb, which will get called anyway if the frame is not dropped in the vlan code. Signed-off-by: Chris Leech <christopher.leech@intel.com> --- net/8021q/vlan_core.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) -- 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