From: Jeff Garzik <jeff@garzik.org>
Date: Tue, 26 Sep 2006 00:09:14 +0000 (-0400)
Subject: Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville... 
X-Git-Tag: v2.6.19-rc1~897^2~5
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b0df3bd1e553e901ec7297267611a5db88240b38;hp=-c;p=pandora-kernel.git

Merge branch 'upstream' of git://git./linux/kernel/git/linville/wireless-2.6 into tmp
---

b0df3bd1e553e901ec7297267611a5db88240b38
diff --combined include/linux/netdevice.h
index afd80eff2725,ac4f50213bc3..13d6d4eb8b3a
--- a/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)