All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jeff Garzik <jgarzik@pobox.com>
To: Jay Vosburgh <fubar@us.ibm.com>
Cc: netdev@vger.kernel.org, David Miller <davem@davemloft.net>,
	Joe Eykholt <jre@nuovasystems.com>
Subject: Re: [PATCH 5/5] net/core: Allow receive on active slaves.
Date: Fri, 04 Jul 2008 08:45:52 -0400	[thread overview]
Message-ID: <486E1B80.7060900@pobox.com> (raw)
In-Reply-To: <1215048128335-git-send-email-fubar@us.ibm.com>

Jay Vosburgh wrote:
> From: Joe Eykholt <jre@nuovasystems.com>
> 
> If a packet_type specifies an active slave to bonding and not just any
> interface, allow it to receive frames that came in on that interface.
> 
> Signed-off-by: Joe Eykholt <jre@nuovasystems.com>
> Signed-off-by: Jay Vosburgh <fubar@us.ibm.com>
> ---
>  net/core/dev.c |    6 ++++--
>  1 files changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/net/core/dev.c b/net/core/dev.c
> index a949664..d68f662 100644
> --- a/net/core/dev.c
> +++ b/net/core/dev.c
> @@ -2104,7 +2104,8 @@ int netif_receive_skb(struct sk_buff *skb)
>  #endif
>  
>  	list_for_each_entry_rcu(ptype, &ptype_all, list) {
> -		if (ptype->dev == null_or_orig || ptype->dev == skb->dev) {
> +		if (ptype->dev == null_or_orig || ptype->dev == skb->dev ||
> +		    ptype->dev == orig_dev) {
>  			if (pt_prev)
>  				ret = deliver_skb(skb, pt_prev, orig_dev);
>  			pt_prev = ptype;
> @@ -2129,7 +2130,8 @@ ncls:
>  	list_for_each_entry_rcu(ptype,
>  			&ptype_base[ntohs(type) & PTYPE_HASH_MASK], list) {
>  		if (ptype->type == type &&
> -		    (ptype->dev == null_or_orig || ptype->dev == skb->dev)) {
> +		    (ptype->dev == null_or_orig || ptype->dev == skb->dev ||
> +		     ptype->dev == orig_dev)) {
>  			if (pt_prev)

This needs a review&ack from David, then OK...



  reply	other threads:[~2008-07-04 12:45 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-07-03  1:21 [PATCH net-next-2.6 0/5] bonding: Refactor, fix, and updates Jay Vosburgh
2008-07-03  1:21 ` [PATCH 1/5] bonding: refactor mii monitor Jay Vosburgh
2008-07-03  1:21   ` [PATCH 2/5] bonding: Don't destroy bonding master when removing slave via sysfs Jay Vosburgh
2008-07-03  1:22     ` [PATCH 3/5] net/core: Uninline skb_bond() Jay Vosburgh
2008-07-03  1:22       ` [PATCH 4/5] net/core: Allow certain receives on inactive slave Jay Vosburgh
2008-07-03  1:22         ` [PATCH 5/5] net/core: Allow receive on active slaves Jay Vosburgh
2008-07-04 12:45           ` Jeff Garzik [this message]
2008-07-06  4:12             ` David Miller
2008-07-06  4:36               ` Joe Eykholt
2008-07-06  4:38                 ` David Miller
2008-07-20  4:20                   ` Joe Eykholt
2008-08-07  8:00   ` [PATCH 1/5] bonding: refactor mii monitor Jeff Garzik
2008-08-06 22:49 ` [PATCH net-next-2.6 0/5] bonding: Refactor, fix, and updates 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=486E1B80.7060900@pobox.com \
    --to=jgarzik@pobox.com \
    --cc=davem@davemloft.net \
    --cc=fubar@us.ibm.com \
    --cc=jre@nuovasystems.com \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.