Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

diff --combined drivers/net/wireless/zd1211rw/zd_mac.c
index cf51e8f8174bd92dbdd04b70cdc0807bb187e544,cc648efb8ede605380ad3cc1d0cefd0683c5515e..8ebf5c33955d791551dd20ac107fca41f75c2b97
--- 1/drivers/net/wireless/zd1211rw/zd_mac.c
--- 2/drivers/net/wireless/zd1211rw/zd_mac.c
+++ b/drivers/net/wireless/zd1211rw/zd_mac.c
@@@ -374,7 -374,7 +374,7 @@@ static void zd_mac_tx_status(struct iee
   * zd_mac_tx_failed - callback for failed frames
   * @dev: the mac80211 wireless device
   *
 - * This function is called if a frame couldn't be succesfully be
 + * This function is called if a frame couldn't be successfully be
   * transferred. The first frame from the tx queue, will be selected and
   * reported as error to the upper layers.
   */
@@@ -828,9 -828,6 +828,6 @@@ int zd_mac_rx(struct ieee80211_hw *hw, 
        stats.freq = zd_channels[_zd_chip_get_channel(&mac->chip) - 1].center_freq;
        stats.band = IEEE80211_BAND_2GHZ;
        stats.signal = status->signal_strength;
-       stats.qual = zd_rx_qual_percent(buffer,
-                                         length - sizeof(struct rx_status),
-                                         status);
  
        rate = zd_rx_rate(buffer, status);