Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next

John W. Linville says:

====================
pull request: wireless-next 2014-07-03

Please pull this first batch of wireless updates intended for the
3.17 stream...

For the mac80211 bits, Johannes says:

"The biggest thing here is probably Arik's TDLS rework, beyond that we
have smaller improvements and features like David's scanning IE thing,
Luca's queue work, some CSA work, etc. Also your PID rate control
removal, of course."

For the iwlwifi bits, Emmanuel says:

"I have here a whole bunch of various things. Andy contributes
better debug prints for dvm specific flows and a module parameter to
completely disable power save for dvm. Andrei is sharing the premises
of his work on CSA - more to come. Eran and Liad keep on working
on the new devices. I have the regular amount of BT Coex stuff and
I continue to work on the firmware error report system adding more
debug capabilities. More to come on that subject too."

On top of that, there are some cleanups to the new rsi driver, some
continuing improvements to the rtl818x drivers, and the usual bundles
of updates to ath9k, b43, mwifiex, wil6210, and a few other bits here
and there.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 10 insertions, 10 deletions

diff --git a/drivers/net/wireless/rt2x00/rt2x00mac.c b/drivers/net/wireless/rt2x00/rt2x00mac.c
index 004dff9b962d..ad6e5a8d1e10 100644
--- a/drivers/net/wireless/rt2x00/rt2x00mac.c
+++ b/drivers/net/wireless/rt2x00/rt2x00mac.c
@@ -626,25 +626,24 @@ void rt2x00mac_bss_info_changed(struct ieee80211_hw *hw,
          * Start/stop beaconing.
          */
         if (changes & BSS_CHANGED_BEACON_ENABLED) {
+                mutex_lock(&intf->beacon_skb_mutex);
                 if (!bss_conf->enable_beacon && intf->enable_beacon) {
                         rt2x00dev->intf_beaconing--;
                         intf->enable_beacon = false;
-                        /*
-                         * Clear beacon in the H/W for this vif. This is needed
-                         * to disable beaconing on this particular interface
-                         * and keep it running on other interfaces.
-                         */
-                        rt2x00queue_clear_beacon(rt2x00dev, vif);
 
                         if (rt2x00dev->intf_beaconing == 0) {
                                 /*
                                  * Last beaconing interface disabled
                                  * -> stop beacon queue.
                                  */
-                                mutex_lock(&intf->beacon_skb_mutex);
                                 rt2x00queue_stop_queue(rt2x00dev->bcn);
-                                mutex_unlock(&intf->beacon_skb_mutex);
                         }
+                        /*
+                         * Clear beacon in the H/W for this vif. This is needed
+                         * to disable beaconing on this particular interface
+                         * and keep it running on other interfaces.
+                         */
+                        rt2x00queue_clear_beacon(rt2x00dev, vif);
                 } else if (bss_conf->enable_beacon && !intf->enable_beacon) {
                         rt2x00dev->intf_beaconing++;
                         intf->enable_beacon = true;
@@ -660,11 +659,10 @@ void rt2x00mac_bss_info_changed(struct ieee80211_hw *hw,
                                  * First beaconing interface enabled
                                  * -> start beacon queue.
                                  */
-                                mutex_lock(&intf->beacon_skb_mutex);
                                 rt2x00queue_start_queue(rt2x00dev->bcn);
-                                mutex_unlock(&intf->beacon_skb_mutex);
                         }
                 }
+                mutex_unlock(&intf->beacon_skb_mutex);
         }
 
         /*
@@ -801,6 +799,8 @@ int rt2x00mac_set_antenna(struct ieee80211_hw *hw, u32 tx_ant, u32 rx_ant)
 
         setup.tx = tx_ant;
         setup.rx = rx_ant;
+        setup.rx_chain_num = 0;
+        setup.tx_chain_num = 0;
 
         rt2x00lib_config_antenna(rt2x00dev, setup);