1 files changed, 11 insertions, 4 deletions

diff --git a/drivers/net/wireless/ath9k/recv.c b/drivers/net/wireless/ath9k/recv.c
index 23b6f54cde5c..ec535834f961 100644
--- a/drivers/net/wireless/ath9k/recv.c
+++ b/drivers/net/wireless/ath9k/recv.c
@@ -16,6 +16,12 @@
 
 #include "ath9k.h"
 
+static struct ieee80211_hw * ath_get_virt_hw(struct ath_softc *sc,
+                                             struct ieee80211_hdr *hdr)
+{
+        return sc->pri_wiphy->hw;
+}
+
 /*
  * Setup and link descriptors.
  *
@@ -123,10 +129,12 @@ static int ath_rx_prepare(struct sk_buff *skb, struct ath_desc *ds,
         struct ieee80211_hdr *hdr;
         u8 ratecode;
         __le16 fc;
+        struct ieee80211_hw *hw;
 
         hdr = (struct ieee80211_hdr *)skb->data;
         fc = hdr->frame_control;
         memset(rx_status, 0, sizeof(struct ieee80211_rx_status));
+        hw = ath_get_virt_hw(sc, hdr);
 
         if (ds->ds_rxstat.rs_more) {
                 /*
@@ -186,7 +194,6 @@ static int ath_rx_prepare(struct sk_buff *skb, struct ath_desc *ds,
                 rx_status->rate_idx = ratecode & 0x7f;
         } else {
                 int i = 0, cur_band, n_rates;
-                struct ieee80211_hw *hw = sc->hw;
 
                 cur_band = hw->conf.channel->band;
                 n_rates = sc->sbands[cur_band].n_bitrates;
@@ -208,8 +215,8 @@ static int ath_rx_prepare(struct sk_buff *skb, struct ath_desc *ds,
         }
 
         rx_status->mactime = ath_extend_tsf(sc, ds->ds_rxstat.rs_tstamp);
-        rx_status->band = sc->hw->conf.channel->band;
-        rx_status->freq =  sc->hw->conf.channel->center_freq;
+        rx_status->band = hw->conf.channel->band;
+        rx_status->freq = hw->conf.channel->center_freq;
         rx_status->noise = sc->ani.noise_floor;
         rx_status->signal = rx_status->noise + ds->ds_rxstat.rs_rssi;
         rx_status->antenna = ds->ds_rxstat.rs_antenna;
@@ -604,7 +611,7 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush)
                 }
 
                 /* Send the frame to mac80211 */
-                __ieee80211_rx(sc->hw, skb, &rx_status);
+                __ieee80211_rx(ath_get_virt_hw(sc, hdr), skb, &rx_status);
 
                 /* We will now give hardware our shiny new allocated skb */
                 bf->bf_mpdu = requeue_skb;