>
>> +}
>> +
>> +/* 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 *dev = skb->dev;
>> + struct net_device *master = dev->master;
>> +
>> + if (master) {
>> + 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, dev, 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;
>> + }
>> + }
>> + return 0;
>> +}
>> +
>> +#endif /* __KERNEL__ */
>> +
>> +#endif /* _LINUX_BONDING_H */
>> diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
>> index ae3c209..06e24ae 100644
>> --- a/include/linux/netdevice.h
>> +++ b/include/linux/netdevice.h
>> @@ -1897,39 +1897,6 @@ static inline void netif_set_gso_max_size(struct net_device *dev,
>> dev->gso_max_size = size;
>> }
>>
>> -/* 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 *dev = skb->dev;
>> - struct net_device *master = dev->master;
>> -
>> - if (master) {
>> - if (master->priv_flags & IFF_MASTER_ARPMON)
>> - dev->last_rx = jiffies;
>> -
>> - 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;
>> - }
>> - }
>> - return 0;
>> -}
>> -
>> extern struct pernet_operations __net_initdata loopback_net_ops;
>>
>> static inline int dev_ethtool_get_settings(struct net_device *dev,
>> diff --git a/net/8021q/vlan_core.c b/net/8021q/vlan_core.c
>> index 7f7de1a..c6eae40 100644
>> --- a/net/8021q/vlan_core.c
>> +++ b/net/8021q/vlan_core.c
>> @@ -2,6 +2,7 @@
>> #include <linux/netdevice.h>
>> #include <linux/if_vlan.h>
>> #include <linux/netpoll.h>
>> +#include <linux/bonding.h>
>> #include "vlan.h"
>>
>> /* VLAN rx hw acceleration helper. This acts like netif_{rx,receive_skb}(). */
>> diff --git a/net/core/dev.c b/net/core/dev.c
>> index 241613f..221b43f 100644
>> --- a/net/core/dev.c
>> +++ b/net/core/dev.c
>> @@ -127,6 +127,7 @@
>> #include <linux/jhash.h>
>> #include <linux/random.h>
>> #include <trace/napi.h>
>> +#include <linux/bonding.h>
>>
>> #include "net-sysfs.h"
>>
>> --
>> To unsubscribe from this list: send the line "unsubscribe netdev" in
>> the body of a message to
majordomo@vger.kernel.org
>> More majordomo info at
http://vger.kernel.org/majordomo-info.html
>>
>>
>
>
