Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville...

diff --combined include/linux/netdevice.h
index afd80ef,ac4f502..13d6d4e
--- 1/include/linux/netdevice.h
--- 2/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@@ -334,7 -334,6 +334,6 @@@ struct net_devic
  
  
        struct net_device_stats* (*get_stats)(struct net_device *dev);
-       struct iw_statistics*   (*get_wireless_stats)(struct net_device *dev);
  
        /* List of functions to handle Wireless Extensions (instead of ioctl).
         * See <net/iw_handler.h> for details. Jean II */
@@@ -1016,8 -1015,7 +1015,8 @@@ static inline int netif_needs_gso(struc
  }
  
  /* On bonding slaves other than the currently active slave, suppress
 - * duplicates except for 802.3ad ETH_P_SLOW and alb non-mcast/bcast.
 + * 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)
  {
@@@ -1026,10 -1024,6 +1025,10 @@@
  
        if (master &&
            (dev->priv_flags & IFF_SLAVE_INACTIVE)) {
 +              if ((dev->priv_flags & IFF_SLAVE_NEEDARP) &&
 +                  skb->protocol == __constant_htons(ETH_P_ARP))
 +                      return 0;
 +
                if (master->priv_flags & IFF_MASTER_ALB) {
                        if (skb->pkt_type != PACKET_BROADCAST &&
                            skb->pkt_type != PACKET_MULTICAST)