[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <486E1B80.7060900@pobox.com>
Date: Fri, 04 Jul 2008 08:45:52 -0400
From: Jeff Garzik <jgarzik@...ox.com>
To: Jay Vosburgh <fubar@...ibm.com>
CC: netdev@...r.kernel.org, David Miller <davem@...emloft.net>,
Joe Eykholt <jre@...vasystems.com>
Subject: Re: [PATCH 5/5] net/core: Allow receive on active slaves.
Jay Vosburgh wrote:
> From: Joe Eykholt <jre@...vasystems.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@...vasystems.com>
> Signed-off-by: Jay Vosburgh <fubar@...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...
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists