mirror of
https://github.com/FEX-Emu/linux.git
synced 2024-12-15 13:22:55 +00:00
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>
This commit is contained in:
parent
0d7a368123
commit
f982307f22
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user