Merge commit 'c1e140bf79d817d4a7aa9932eb98b0359c87af33' from mac80211-next

Patch "ath9k: Fix no-ack frame status" needs these mac80211 patches:

commit 5cf16616e152dd5c274a65954c77f64892d025a8
Author: Sujith Manoharan <c_manoha@qca.qualcomm.com>
Date:   Wed Dec 10 21:26:11 2014 +0530

    mac80211: Fix accounting of multicast frames

commit 6b127c71fbdd3daacfd8b9f80b8e6ebfb70a889e
Author: Sujith Manoharan <c_manoha@qca.qualcomm.com>
Date:   Wed Dec 10 21:26:10 2014 +0530

    mac80211: Move IEEE80211_TX_CTL_PS_RESPONSE

Conflicts:
	drivers/net/wireless/ath/wil6210/cfg80211.c
	drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c

1 files changed, 6 insertions, 6 deletions

diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c
index 81ee481487cf..be2d54f257b1 100644
--- a/drivers/net/wireless/rt2x00/rt2800lib.c
+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
@@ -8020,13 +8020,13 @@ int rt2800_get_survey(struct ieee80211_hw *hw, int idx,
         rt2800_register_read(rt2x00dev, CH_BUSY_STA_SEC, &busy_ext);
 
         if (idle || busy) {
-                survey->filled = SURVEY_INFO_CHANNEL_TIME |
-                                 SURVEY_INFO_CHANNEL_TIME_BUSY |
-                                 SURVEY_INFO_CHANNEL_TIME_EXT_BUSY;
+                survey->filled = SURVEY_INFO_TIME |
+                                 SURVEY_INFO_TIME_BUSY |
+                                 SURVEY_INFO_TIME_EXT_BUSY;
 
-                survey->channel_time = (idle + busy) / 1000;
-                survey->channel_time_busy = busy / 1000;
-                survey->channel_time_ext_busy = busy_ext / 1000;
+                survey->time = (idle + busy) / 1000;
+                survey->time_busy = busy / 1000;
+                survey->time_ext_busy = busy_ext / 1000;
         }
 
         if (!(hw->conf.flags & IEEE80211_CONF_OFFCHANNEL))