aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
Diffstat (limited to 'net')
-rw-r--r--net/core/dev.c18
1 files changed, 1 insertions, 17 deletions
diff --git a/net/core/dev.c b/net/core/dev.c
index d95e2626d944..9fe96cde3e19 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -1619,26 +1619,10 @@ static inline struct net_device *skb_bond(struct sk_buff *skb)
1619 struct net_device *dev = skb->dev; 1619 struct net_device *dev = skb->dev;
1620 1620
1621 if (dev->master) { 1621 if (dev->master) {
1622 /* 1622 if (skb_bond_should_drop(skb)) {
1623 * On bonding slaves other than the currently active
1624 * slave, suppress duplicates except for 802.3ad
1625 * ETH_P_SLOW and alb non-mcast/bcast.
1626 */
1627 if (dev->priv_flags & IFF_SLAVE_INACTIVE) {
1628 if (dev->master->priv_flags & IFF_MASTER_ALB) {
1629 if (skb->pkt_type != PACKET_BROADCAST &&
1630 skb->pkt_type != PACKET_MULTICAST)
1631 goto keep;
1632 }
1633
1634 if (dev->master->priv_flags & IFF_MASTER_8023AD &&
1635 skb->protocol == __constant_htons(ETH_P_SLOW))
1636 goto keep;
1637
1638 kfree_skb(skb); 1623 kfree_skb(skb);
1639 return NULL; 1624 return NULL;
1640 } 1625 }
1641keep:
1642 skb->dev = dev->master; 1626 skb->dev = dev->master;
1643 } 1627 }
1644 1628