From: John Fastabend <john.r.fastabend@intel.com>
To: andy@greyhouse.net, fubar@us.ibm.com, nhorman@tuxdriver.com,
bonding-devel@lists.sourceforge.net, netdev@vger.kernel.org
Cc: john.r.fastabend@intel.com
Subject: [PATCH 2/3] net: fix conflict between null_or_orig and null_or_bond
Date: Thu, 13 May 2010 00:31:11 -0700 [thread overview]
Message-ID: <20100513073111.3528.19949.stgit@jf-dev2-dcblab> (raw)
In-Reply-To: <20100513073106.3528.45412.stgit@jf-dev2-dcblab>
If a skb is received on an inactive bond that does not meet
the special cases checked for by skb_bond_should_drop it should
only be delivered to exact matches as the comment in
netif_receive_skb() says.
However because null_or_bond could also be null this is not
always true. This patch renames null_or_bond to orig_or_bond
and initializes it to orig_dev. This keeps the intent of
null_or_bond to pass frames received on VLAN interfaces stacked
on bonding interfaces without invalidating the statement for
null_or_orig.
Signed-off-by: John Fastabend <john.r.fastabend@intel.com>
---
net/core/dev.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/net/core/dev.c b/net/core/dev.c
index 32611c8..3dc691d 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -2784,7 +2784,7 @@ static int __netif_receive_skb(struct sk_buff *skb)
struct net_device *orig_dev;
struct net_device *master;
struct net_device *null_or_orig;
- struct net_device *null_or_bond;
+ struct net_device *orig_or_bond;
int ret = NET_RX_DROP;
__be16 type;
@@ -2857,10 +2857,10 @@ ncls:
* device that may have registered for a specific ptype. The
* handler may have to adjust skb->dev and orig_dev.
*/
- null_or_bond = NULL;
+ orig_or_bond = orig_dev;
if ((skb->dev->priv_flags & IFF_802_1Q_VLAN) &&
(vlan_dev_real_dev(skb->dev)->priv_flags & IFF_BONDING)) {
- null_or_bond = vlan_dev_real_dev(skb->dev);
+ orig_or_bond = vlan_dev_real_dev(skb->dev);
}
type = skb->protocol;
@@ -2868,7 +2868,7 @@ ncls:
&ptype_base[ntohs(type) & PTYPE_HASH_MASK], list) {
if (ptype->type == type && (ptype->dev == null_or_orig ||
ptype->dev == skb->dev || ptype->dev == orig_dev ||
- ptype->dev == null_or_bond)) {
+ ptype->dev == orig_or_bond)) {
if (pt_prev)
ret = deliver_skb(skb, pt_prev, orig_dev);
pt_prev = ptype;
next prev parent reply other threads:[~2010-05-13 7:30 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-13 7:31 [PATCH 1/3] net: init_vlan should not copy slave or master flags John Fastabend
2010-05-13 7:31 ` John Fastabend [this message]
2010-06-02 10:35 ` [PATCH 2/3] net: fix conflict between null_or_orig and null_or_bond David Miller
2010-05-13 7:31 ` [PATCH 3/3] net: deliver skbs on inactive slaves to exact matches John Fastabend
2010-05-27 4:52 ` John Fastabend
2010-06-02 10:36 ` David Miller
2010-06-02 20:01 ` Jay Vosburgh
2010-06-03 15:19 ` John Fastabend
2010-06-02 10:35 ` [PATCH 1/3] net: init_vlan should not copy slave or master flags David Miller
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=20100513073111.3528.19949.stgit@jf-dev2-dcblab \
--to=john.r.fastabend@intel.com \
--cc=andy@greyhouse.net \
--cc=bonding-devel@lists.sourceforge.net \
--cc=fubar@us.ibm.com \
--cc=netdev@vger.kernel.org \
--cc=nhorman@tuxdriver.com \
/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).