From: John W. Linville <linville@tuxdriver.com>
Date: Tue, 11 Jun 2013 18:48:32 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: v3.11-rc1~16^2~103^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3899ba90a4ab2f3cab8e0f91a76c14ff131c8293;p=platform%2Fkernel%2Flinux-exynos.git

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

Conflicts:
	drivers/net/wireless/ath/ath9k/debug.c
	net/mac80211/iface.c
---

3899ba90a4ab2f3cab8e0f91a76c14ff131c8293
diff --cc drivers/net/wireless/ath/ath9k/debug.c
index 51cc0fa,7852f6e..87454f6
--- a/drivers/net/wireless/ath/ath9k/debug.c
+++ b/drivers/net/wireless/ath/ath9k/debug.c
@@@ -200,12 -244,15 +244,15 @@@ static ssize_t write_file_ani(struct fi
  		return -EFAULT;
  
  	buf[len] = '\0';
- 	if (kstrtoul(buf, 0, &disable_ani))
 -	if (strict_strtoul(buf, 0, &ani))
++	if (kstrtoul(buf, 0, &ani))
  		return -EINVAL;
  
- 	common->disable_ani = !!disable_ani;
+ 	if (ani < 0 || ani > 1)
+ 		return -EINVAL;
+ 
+ 	common->disable_ani = !ani;
  
- 	if (disable_ani) {
+ 	if (common->disable_ani) {
  		clear_bit(SC_OP_ANI_RUN, &sc->sc_flags);
  		ath_stop_ani(sc);
  	} else {
diff --cc drivers/net/wireless/ath/ath9k/main.c
index 5092eca,cc5a98b..e5b186b
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
@@@ -1687,10 -1686,9 +1686,10 @@@ static int ath9k_ampdu_action(struct ie
  			      u16 tid, u16 *ssn, u8 buf_size)
  {
  	struct ath_softc *sc = hw->priv;
 +	bool flush = false;
  	int ret = 0;
  
- 	local_bh_disable();
+ 	mutex_lock(&sc->mutex);
  
  	switch (action) {
  	case IEEE80211_AMPDU_RX_START:
diff --cc net/mac80211/iface.c
index 7c3ba86,7cabaf2..cc11759
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
@@@ -159,10 -159,10 +159,11 @@@ static int ieee80211_change_mtu(struct 
  	return 0;
  }
  
- static int ieee80211_verify_mac(struct ieee80211_sub_if_data *sdata, u8 *addr)
 -static int ieee80211_verify_mac(struct ieee80211_local *local, u8 *addr,
++static int ieee80211_verify_mac(struct ieee80211_sub_if_data *sdata, u8 *addr,
+ 				bool check_dup)
  {
 -	struct ieee80211_sub_if_data *sdata;
 +	struct ieee80211_local *local = sdata->local;
 +	struct ieee80211_sub_if_data *iter;
  	u64 new, mask, tmp;
  	u8 *m;
  	int ret = 0;
@@@ -180,16 -180,16 +181,19 @@@
  		((u64)m[2] << 3*8) | ((u64)m[3] << 2*8) |
  		((u64)m[4] << 1*8) | ((u64)m[5] << 0*8);
  
+ 	if (!check_dup)
+ 		return ret;
  
  	mutex_lock(&local->iflist_mtx);
 -	list_for_each_entry(sdata, &local->interfaces, list) {
 -		if (sdata->vif.type == NL80211_IFTYPE_MONITOR &&
 -		    !(sdata->u.mntr_flags & MONITOR_FLAG_ACTIVE))
 +	list_for_each_entry(iter, &local->interfaces, list) {
 +		if (iter == sdata)
  			continue;
  
- 		if (iter->vif.type == NL80211_IFTYPE_MONITOR)
 -		m = sdata->vif.addr;
++		if (iter->vif.type == NL80211_IFTYPE_MONITOR &&
++		    !(iter->u.mntr_flags & MONITOR_FLAG_ACTIVE))
 +			continue;
 +
 +		m = iter->vif.addr;
  		tmp =	((u64)m[0] << 5*8) | ((u64)m[1] << 4*8) |
  			((u64)m[2] << 3*8) | ((u64)m[3] << 2*8) |
  			((u64)m[4] << 1*8) | ((u64)m[5] << 0*8);
@@@ -213,7 -214,11 +218,11 @@@ static int ieee80211_change_mac(struct 
  	if (ieee80211_sdata_running(sdata))
  		return -EBUSY;
  
- 	ret = ieee80211_verify_mac(sdata, sa->sa_data);
+ 	if (sdata->vif.type == NL80211_IFTYPE_MONITOR &&
+ 	    !(sdata->u.mntr_flags & MONITOR_FLAG_ACTIVE))
+ 		check_dup = false;
+ 
 -	ret = ieee80211_verify_mac(sdata->local, sa->sa_data, check_dup);
++	ret = ieee80211_verify_mac(sdata, sa->sa_data, check_dup);
  	if (ret)
  		return ret;