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

diff --combined drivers/net/wireless/ath/ath9k/init.c
index ac51071,2e96346..aa0ff7e
--- 1/drivers/net/wireless/ath/ath9k/init.c
--- 2/drivers/net/wireless/ath/ath9k/init.c
+++ b/drivers/net/wireless/ath/ath9k/init.c
@@@ -14,7 -14,6 +14,7 @@@
   * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
   */
  
 +#include <linux/dma-mapping.h>
  #include <linux/slab.h>
  #include <linux/ath9k_platform.h>
  
@@@ -670,8 -669,10 +670,10 @@@ static void ath9k_init_band_txpower(str
  static void ath9k_init_txpower_limits(struct ath_softc *sc)
  {
        struct ath_hw *ah = sc->sc_ah;
+       struct ath_common *common = ath9k_hw_common(sc->sc_ah);
        struct ath9k_channel *curchan = ah->curchan;
  
+       ah->txchainmask = common->tx_chainmask;
        if (ah->caps.hw_caps & ATH9K_HW_CAP_2GHZ)
                ath9k_init_band_txpower(sc, IEEE80211_BAND_2GHZ);
        if (ah->caps.hw_caps & ATH9K_HW_CAP_5GHZ)

diff --combined drivers/net/wireless/rt2x00/rt2800lib.c
index 84ab7d1,f94d669..ef67f67
--- 1/drivers/net/wireless/rt2x00/rt2800lib.c
--- 2/drivers/net/wireless/rt2x00/rt2800lib.c
+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
@@@ -703,8 -703,7 +703,7 @@@ void rt2800_write_beacon(struct queue_e
        /*
         * Add space for the TXWI in front of the skb.
         */
-       skb_push(entry->skb, TXWI_DESC_SIZE);
-       memset(entry->skb, 0, TXWI_DESC_SIZE);
+       memset(skb_push(entry->skb, TXWI_DESC_SIZE), 0, TXWI_DESC_SIZE);
  
        /*
         * Register descriptor details in skb frame descriptor.
@@@ -1274,7 -1273,7 +1273,7 @@@ static void rt2800_config_ht_opmode(str
                        gf20_rate = gf40_rate = 0x0003;
                }
                break;
 -      };
 +      }
  
        /* check for STAs not supporting greenfield mode */
        if (any_sta_nongf)