1 files changed, 4 insertions, 44 deletions

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index d1a21b576a40..470f7c951afb 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -2089,54 +2089,14 @@ static inline void netif_set_gso_max_size(struct net_device *dev,
         dev->gso_max_size = size;
 }
 
-static inline void skb_bond_set_mac_by_master(struct sk_buff *skb,
-                                              struct net_device *master)
-{
-        if (skb->pkt_type == PACKET_HOST) {
-                u16 *dest = (u16 *) eth_hdr(skb)->h_dest;
-
-                memcpy(dest, master->dev_addr, ETH_ALEN);
-        }
-}
+extern int __skb_bond_should_drop(struct sk_buff *skb,
+                                  struct net_device *master);
 
-/* On bonding slaves other than the currently active slave, suppress
- * duplicates except for 802.3ad ETH_P_SLOW, alb non-mcast/bcast, and
- * ARP on active-backup slaves with arp_validate enabled.
- */
 static inline int skb_bond_should_drop(struct sk_buff *skb,
                                        struct net_device *master)
 {
-        if (master) {
-                struct net_device *dev = skb->dev;
-
-                if (master->priv_flags & IFF_MASTER_ARPMON)
-                        dev->last_rx = jiffies;
-
-                if ((master->priv_flags & IFF_MASTER_ALB) && master->br_port) {
-                        /* Do address unmangle. The local destination address
-                         * will be always the one master has. Provides the right
-                         * functionality in a bridge.
-                         */
-                        skb_bond_set_mac_by_master(skb, master);
-                }
-
-                if (dev->priv_flags & IFF_SLAVE_INACTIVE) {
-                        if ((dev->priv_flags & IFF_SLAVE_NEEDARP) &&
-                            skb->protocol == __cpu_to_be16(ETH_P_ARP))
-                                return 0;
-
-                        if (master->priv_flags & IFF_MASTER_ALB) {
-                                if (skb->pkt_type != PACKET_BROADCAST &&
-                                    skb->pkt_type != PACKET_MULTICAST)
-                                        return 0;
-                        }
-                        if (master->priv_flags & IFF_MASTER_8023AD &&
-                            skb->protocol == __cpu_to_be16(ETH_P_SLOW))
-                                return 0;
-
-                        return 1;
-                }
-        }
+        if (master)
+                return __skb_bond_should_drop(skb, master);
         return 0;
 }