diff options
| author | Joe Eykholt <jre@nuovasystems.com> | 2008-07-02 18:22:02 -0700 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@redhat.com> | 2008-08-07 04:00:01 -0400 |
| commit | f982307f22db96201e41540295f24e8dcc10c78f (patch) | |
| tree | cb7c3f07691ffd9ace90dc4c8d1672009e0cd6cd /net/core | |
| parent | 0d7a3681232f545c6a59f77e60f7667673ef0e93 (diff) | |
| download | kernel_samsung_aries-f982307f22db96201e41540295f24e8dcc10c78f.zip kernel_samsung_aries-f982307f22db96201e41540295f24e8dcc10c78f.tar.gz kernel_samsung_aries-f982307f22db96201e41540295f24e8dcc10c78f.tar.bz2 | |
net/core: Allow receive on active slaves.
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>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'net/core')
| -rw-r--r-- | 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 dab97c7..600bb23 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -2210,7 +2210,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; @@ -2235,7 +2236,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) ret = deliver_skb(skb, pt_prev, orig_dev); pt_prev = ptype; |