From: Chris Leech <christopher.leech@intel.com>
To: netdev@vger.kernel.org, Andy Gospodarek <andy@greyhouse.net>,
Patrick McHardy <kaber@trash.net>
Cc: bonding-devel@lists.sourceforge.net
Subject: [PATCH] vlan: remove receive checks for bonding
Date: Mon, 12 Apr 2010 15:17:23 -0700 [thread overview]
Message-ID: <20100412221723.8068.75393.stgit@localhost6.localdomain6> (raw)
In-Reply-To: <20100412221645.8068.71073.stgit@localhost6.localdomain6>
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(-)
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);
next prev parent reply other threads:[~2010-04-12 22:17 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-04-12 22:17 Receive issues with bonding and vlans Chris Leech
2010-04-12 22:17 ` Chris Leech [this message]
2010-04-12 23:19 ` [PATCH] vlan: remove receive checks for bonding Jay Vosburgh
2010-04-12 23:10 ` Receive issues with bonding and vlans Jay Vosburgh
2010-04-12 23:35 ` Chris Leech
2010-04-13 0:08 ` Jay Vosburgh
2010-05-03 3:04 ` John Fastabend
2010-05-03 18:25 ` Jay Vosburgh
2010-05-03 21:17 ` John Fastabend
2010-05-03 23:17 ` Jay Vosburgh
2010-05-05 5:35 ` John Fastabend
2010-05-06 17:42 ` Jay Vosburgh
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100412221723.8068.75393.stgit@localhost6.localdomain6 \
--to=christopher.leech@intel.com \
--cc=andy@greyhouse.net \
--cc=bonding-devel@lists.sourceforge.net \
--cc=kaber@trash.net \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).