From: John W. Linville <linville@tuxdriver.com>
Date: Tue, 11 May 2010 18:24:55 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: v2.6.35-rc1~473^2~167
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=cc755896a4274f11283bca32d1d658203844057a

Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-next-2.6 into for-davem

Conflicts:
	drivers/net/wireless/ath/ar9170/main.c
---

cc755896a4274f11283bca32d1d658203844057a
diff --cc drivers/net/wireless/rtl818x/rtl8180_dev.c
index 21307f2412b8,9430f962c168..515817de2905
--- a/drivers/net/wireless/rtl818x/rtl8180_dev.c
+++ b/drivers/net/wireless/rtl818x/rtl8180_dev.c
@@@ -722,13 -790,22 +791,22 @@@ static void rtl8180_bss_info_changed(st
  	}
  
  	if (changed & BSS_CHANGED_ERP_SLOT && priv->rf->conf_erp)
- 	        priv->rf->conf_erp(dev, info);
+ 		priv->rf->conf_erp(dev, info);
+ 
+ 	if (changed & BSS_CHANGED_BEACON_ENABLED)
+ 		vif_priv->enable_beacon = info->enable_beacon;
+ 
+ 	if (changed & (BSS_CHANGED_BEACON_ENABLED | BSS_CHANGED_BEACON)) {
+ 		cancel_delayed_work_sync(&vif_priv->beacon_work);
+ 		if (vif_priv->enable_beacon)
+ 			schedule_work(&vif_priv->beacon_work.work);
+ 	}
  }
  
 -static u64 rtl8180_prepare_multicast(struct ieee80211_hw *dev, int mc_count,
 -				     struct dev_addr_list *mc_list)
 +static u64 rtl8180_prepare_multicast(struct ieee80211_hw *dev,
 +				     struct netdev_hw_addr_list *mc_list)
  {
 -	return mc_count;
 +	return netdev_hw_addr_list_count(mc_list);
  }
  
  static void rtl8180_configure_filter(struct ieee80211_hw *dev,