8 files changed, 88 insertions, 36 deletions

diff --git a/drivers/net/wireless/ath9k/ahb.c b/drivers/net/wireless/ath9k/ahb.c
index 391c9fd3b646..bc562bd88890 100644
--- a/drivers/net/wireless/ath9k/ahb.c
+++ b/drivers/net/wireless/ath9k/ahb.c
@@ -96,7 +96,8 @@ static int ath_ahb_probe(struct platform_device *pdev)
 
         irq = res->start;
 
-        hw = ieee80211_alloc_hw(sizeof(struct ath_softc), &ath9k_ops);
+        hw = ieee80211_alloc_hw(sizeof(struct ath_wiphy) +
+                                sizeof(struct ath_softc), &ath9k_ops);
         if (hw == NULL) {
                 dev_err(&pdev->dev, "no memory for ieee80211_hw\n");
                 ret = -ENOMEM;
@@ -106,7 +107,11 @@ static int ath_ahb_probe(struct platform_device *pdev)
         SET_IEEE80211_DEV(hw, &pdev->dev);
         platform_set_drvdata(pdev, hw);
 
-        sc = hw->priv;
+        aphy = hw->priv;
+        sc = (struct ath_softc *) (aphy + 1);
+        aphy->sc = sc;
+        aphy->hw = hw;
+        sc->pri_wiphy = aphy;
         sc->hw = hw;
         sc->dev = &pdev->dev;
         sc->mem = mem;
@@ -156,7 +161,8 @@ static int ath_ahb_remove(struct platform_device *pdev)
         struct ieee80211_hw *hw = platform_get_drvdata(pdev);
 
         if (hw) {
-                struct ath_softc *sc = hw->priv;
+                struct ath_wiphy *aphy = hw->priv;
+                struct ath_softc *sc = aphy->sc;
 
                 ath_cleanup(sc);
                 platform_set_drvdata(pdev, NULL);
diff --git a/drivers/net/wireless/ath9k/ath9k.h b/drivers/net/wireless/ath9k/ath9k.h
index 1598bac9242d..41eeac42a80c 100644
--- a/drivers/net/wireless/ath9k/ath9k.h
+++ b/drivers/net/wireless/ath9k/ath9k.h
@@ -549,9 +549,12 @@ struct ath_bus_ops {
         bool            (*eeprom_read)(struct ath_hw *ah, u32 off, u16 *data);
 };
 
+struct ath_wiphy;
+
 struct ath_softc {
         struct ieee80211_hw *hw;
         struct device *dev;
+        struct ath_wiphy *pri_wiphy;
         struct tasklet_struct intr_tq;
         struct tasklet_struct bcon_tasklet;
         struct ath_hw *sc_ah;
@@ -607,6 +610,11 @@ struct ath_softc {
         struct ath_bus_ops *bus_ops;
 };
 
+struct ath_wiphy {
+        struct ath_softc *sc; /* shared for all virtual wiphys */
+        struct ieee80211_hw *hw;
+};
+
 int ath_reset(struct ath_softc *sc, bool retry_tx);
 int ath_get_hal_qnum(u16 queue, struct ath_softc *sc);
 int ath_get_mac80211_qnum(u32 queue, struct ath_softc *sc);
diff --git a/drivers/net/wireless/ath9k/main.c b/drivers/net/wireless/ath9k/main.c
index 599218def799..0c0e587d7942 100644
--- a/drivers/net/wireless/ath9k/main.c
+++ b/drivers/net/wireless/ath9k/main.c
@@ -1934,7 +1934,8 @@ static void ath9k_update_ichannel(struct ath_softc *sc,
 
 static int ath9k_start(struct ieee80211_hw *hw)
 {
-        struct ath_softc *sc = hw->priv;
+        struct ath_wiphy *aphy = hw->priv;
+        struct ath_softc *sc = aphy->sc;
         struct ieee80211_channel *curchan = hw->conf.channel;
         struct ath9k_channel *init_channel;
         int r, pos;
@@ -2012,7 +2013,7 @@ static int ath9k_start(struct ieee80211_hw *hw)
         sc->imask &= ~(ATH9K_INT_SWBA | ATH9K_INT_BMISS);
         ath9k_hw_set_interrupts(sc->sc_ah, sc->imask);
 
-        ieee80211_wake_queues(sc->hw);
+        ieee80211_wake_queues(hw);
 
 #if defined(CONFIG_RFKILL) || defined(CONFIG_RFKILL_MODULE)
         r = ath_start_rfkill_poll(sc);
@@ -2028,7 +2029,8 @@ static int ath9k_tx(struct ieee80211_hw *hw,
                     struct sk_buff *skb)
 {
         struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
-        struct ath_softc *sc = hw->priv;
+        struct ath_wiphy *aphy = hw->priv;
+        struct ath_softc *sc = aphy->sc;
         struct ath_tx_control txctl;
         int hdrlen, padsize;
 
@@ -2078,7 +2080,8 @@ exit:
 
 static void ath9k_stop(struct ieee80211_hw *hw)
 {
-        struct ath_softc *sc = hw->priv;
+        struct ath_wiphy *aphy = hw->priv;
+        struct ath_softc *sc = aphy->sc;
 
         if (sc->sc_flags & SC_OP_INVALID) {
                 DPRINTF(sc, ATH_DBG_ANY, "Device not present\n");
@@ -2087,7 +2090,7 @@ static void ath9k_stop(struct ieee80211_hw *hw)
 
         mutex_lock(&sc->mutex);
 
-        ieee80211_stop_queues(sc->hw);
+        ieee80211_stop_queues(hw);
 
         /* make sure h/w will not generate any interrupt
          * before setting the invalid flag. */
@@ -2118,7 +2121,8 @@ static void ath9k_stop(struct ieee80211_hw *hw)
 static int ath9k_add_interface(struct ieee80211_hw *hw,
                                struct ieee80211_if_init_conf *conf)
 {
-        struct ath_softc *sc = hw->priv;
+        struct ath_wiphy *aphy = hw->priv;
+        struct ath_softc *sc = aphy->sc;
         struct ath_vif *avp = (void *)conf->vif->drv_priv;
         enum nl80211_iftype ic_opmode = NL80211_IFTYPE_UNSPECIFIED;
         int ret = 0;
@@ -2217,7 +2221,8 @@ out:
 static void ath9k_remove_interface(struct ieee80211_hw *hw,
                                    struct ieee80211_if_init_conf *conf)
 {
-        struct ath_softc *sc = hw->priv;
+        struct ath_wiphy *aphy = hw->priv;
+        struct ath_softc *sc = aphy->sc;
         struct ath_vif *avp = (void *)conf->vif->drv_priv;
         int i;
 
@@ -2252,7 +2257,8 @@ static void ath9k_remove_interface(struct ieee80211_hw *hw,
 
 static int ath9k_config(struct ieee80211_hw *hw, u32 changed)
 {
-        struct ath_softc *sc = hw->priv;
+        struct ath_wiphy *aphy = hw->priv;
+        struct ath_softc *sc = aphy->sc;
         struct ieee80211_conf *conf = &hw->conf;
 
         mutex_lock(&sc->mutex);
@@ -2319,7 +2325,8 @@ static int ath9k_config_interface(struct ieee80211_hw *hw,
                                   struct ieee80211_vif *vif,
                                   struct ieee80211_if_conf *conf)
 {
-        struct ath_softc *sc = hw->priv;
+        struct ath_wiphy *aphy = hw->priv;
+        struct ath_softc *sc = aphy->sc;
         struct ath_hw *ah = sc->sc_ah;
         struct ath_vif *avp = (void *)vif->drv_priv;
         u32 rfilt = 0;
@@ -2424,7 +2431,8 @@ static void ath9k_configure_filter(struct ieee80211_hw *hw,
                                    int mc_count,
                                    struct dev_mc_list *mclist)
 {
-        struct ath_softc *sc = hw->priv;
+        struct ath_wiphy *aphy = hw->priv;
+        struct ath_softc *sc = aphy->sc;
         u32 rfilt;
 
         changed_flags &= SUPPORTED_FILTERS;
@@ -2442,7 +2450,8 @@ static void ath9k_sta_notify(struct ieee80211_hw *hw,
                              enum sta_notify_cmd cmd,
                              struct ieee80211_sta *sta)
 {
-        struct ath_softc *sc = hw->priv;
+        struct ath_wiphy *aphy = hw->priv;
+        struct ath_softc *sc = aphy->sc;
 
         switch (cmd) {
         case STA_NOTIFY_ADD:
@@ -2459,7 +2468,8 @@ static void ath9k_sta_notify(struct ieee80211_hw *hw,
 static int ath9k_conf_tx(struct ieee80211_hw *hw, u16 queue,
                          const struct ieee80211_tx_queue_params *params)
 {
-        struct ath_softc *sc = hw->priv;
+        struct ath_wiphy *aphy = hw->priv;
+        struct ath_softc *sc = aphy->sc;
         struct ath9k_tx_queue_info qi;
         int ret = 0, qnum;
 
@@ -2495,7 +2505,8 @@ static int ath9k_set_key(struct ieee80211_hw *hw,
                          struct ieee80211_sta *sta,
                          struct ieee80211_key_conf *key)
 {
-        struct ath_softc *sc = hw->priv;
+        struct ath_wiphy *aphy = hw->priv;
+        struct ath_softc *sc = aphy->sc;
         int ret = 0;
 
         if (modparam_nohwcrypt)
@@ -2537,7 +2548,8 @@ static void ath9k_bss_info_changed(struct ieee80211_hw *hw,
                                    struct ieee80211_bss_conf *bss_conf,
                                    u32 changed)
 {
-        struct ath_softc *sc = hw->priv;
+        struct ath_wiphy *aphy = hw->priv;
+        struct ath_softc *sc = aphy->sc;
 
         mutex_lock(&sc->mutex);
 
@@ -2572,7 +2584,8 @@ static void ath9k_bss_info_changed(struct ieee80211_hw *hw,
 static u64 ath9k_get_tsf(struct ieee80211_hw *hw)
 {
         u64 tsf;
-        struct ath_softc *sc = hw->priv;
+        struct ath_wiphy *aphy = hw->priv;
+        struct ath_softc *sc = aphy->sc;
 
         mutex_lock(&sc->mutex);
         tsf = ath9k_hw_gettsf64(sc->sc_ah);
@@ -2583,7 +2596,8 @@ static u64 ath9k_get_tsf(struct ieee80211_hw *hw)
 
 static void ath9k_set_tsf(struct ieee80211_hw *hw, u64 tsf)
 {
-        struct ath_softc *sc = hw->priv;
+        struct ath_wiphy *aphy = hw->priv;
+        struct ath_softc *sc = aphy->sc;
 
         mutex_lock(&sc->mutex);
         ath9k_hw_settsf64(sc->sc_ah, tsf);
@@ -2592,7 +2606,8 @@ static void ath9k_set_tsf(struct ieee80211_hw *hw, u64 tsf)
 
 static void ath9k_reset_tsf(struct ieee80211_hw *hw)
 {
-        struct ath_softc *sc = hw->priv;
+        struct ath_wiphy *aphy = hw->priv;
+        struct ath_softc *sc = aphy->sc;
 
         mutex_lock(&sc->mutex);
         ath9k_hw_reset_tsf(sc->sc_ah);
@@ -2604,7 +2619,8 @@ static int ath9k_ampdu_action(struct ieee80211_hw *hw,
                               struct ieee80211_sta *sta,
                               u16 tid, u16 *ssn)
 {
-        struct ath_softc *sc = hw->priv;
+        struct ath_wiphy *aphy = hw->priv;
+        struct ath_softc *sc = aphy->sc;
         int ret = 0;
 
         switch (action) {
@@ -2642,7 +2658,8 @@ static int ath9k_ampdu_action(struct ieee80211_hw *hw,
 
 static void ath9k_sw_scan_start(struct ieee80211_hw *hw)
 {
-        struct ath_softc *sc = hw->priv;
+        struct ath_wiphy *aphy = hw->priv;
+        struct ath_softc *sc = aphy->sc;
 
         mutex_lock(&sc->mutex);
         sc->sc_flags |= SC_OP_SCANNING;
@@ -2651,7 +2668,8 @@ static void ath9k_sw_scan_start(struct ieee80211_hw *hw)
 
 static void ath9k_sw_scan_complete(struct ieee80211_hw *hw)
 {
-        struct ath_softc *sc = hw->priv;
+        struct ath_wiphy *aphy = hw->priv;
+        struct ath_softc *sc = aphy->sc;
 
         mutex_lock(&sc->mutex);
         sc->sc_flags &= ~SC_OP_SCANNING;
diff --git a/drivers/net/wireless/ath9k/pci.c b/drivers/net/wireless/ath9k/pci.c
index eea9d3a9d43c..9a58baabb9ca 100644
--- a/drivers/net/wireless/ath9k/pci.c
+++ b/drivers/net/wireless/ath9k/pci.c
@@ -83,6 +83,7 @@ static struct ath_bus_ops ath_pci_bus_ops = {
 static int ath_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 {
         void __iomem *mem;
+        struct ath_wiphy *aphy;
         struct ath_softc *sc;
         struct ieee80211_hw *hw;
         u8 csz;
@@ -155,7 +156,8 @@ static int ath_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
                 goto bad1;
         }
 
-        hw = ieee80211_alloc_hw(sizeof(struct ath_softc), &ath9k_ops);
+        hw = ieee80211_alloc_hw(sizeof(struct ath_wiphy) +
+                                sizeof(struct ath_softc), &ath9k_ops);
         if (hw == NULL) {
                 printk(KERN_ERR "ath_pci: no memory for ieee80211_hw\n");
                 goto bad2;
@@ -164,7 +166,11 @@ static int ath_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
         SET_IEEE80211_DEV(hw, &pdev->dev);
         pci_set_drvdata(pdev, hw);
 
-        sc = hw->priv;
+        aphy = hw->priv;
+        sc = (struct ath_softc *) (aphy + 1);
+        aphy->sc = sc;
+        aphy->hw = hw;
+        sc->pri_wiphy = aphy;
         sc->hw = hw;
         sc->dev = &pdev->dev;
         sc->mem = mem;
@@ -214,7 +220,8 @@ bad:
 static void ath_pci_remove(struct pci_dev *pdev)
 {
         struct ieee80211_hw *hw = pci_get_drvdata(pdev);
-        struct ath_softc *sc = hw->priv;
+        struct ath_wiphy *aphy = hw->priv;
+        struct ath_softc *sc = aphy->sc;
 
         ath_cleanup(sc);
 }
@@ -224,7 +231,8 @@ static void ath_pci_remove(struct pci_dev *pdev)
 static int ath_pci_suspend(struct pci_dev *pdev, pm_message_t state)
 {
         struct ieee80211_hw *hw = pci_get_drvdata(pdev);
-        struct ath_softc *sc = hw->priv;
+        struct ath_wiphy *aphy = hw->priv;
+        struct ath_softc *sc = aphy->sc;
 
         ath9k_hw_set_gpio(sc->sc_ah, ATH_LED_PIN, 1);
 
@@ -243,7 +251,8 @@ static int ath_pci_suspend(struct pci_dev *pdev, pm_message_t state)
 static int ath_pci_resume(struct pci_dev *pdev)
 {
         struct ieee80211_hw *hw = pci_get_drvdata(pdev);
-        struct ath_softc *sc = hw->priv;
+        struct ath_wiphy *aphy = hw->priv;
+        struct ath_softc *sc = aphy->sc;
         u32 val;
         int err;
 
diff --git a/drivers/net/wireless/ath9k/rc.c b/drivers/net/wireless/ath9k/rc.c
index 6d7e636054ed..832735677a46 100644
--- a/drivers/net/wireless/ath9k/rc.c
+++ b/drivers/net/wireless/ath9k/rc.c
@@ -1673,7 +1673,8 @@ static void ath_rate_update(void *priv, struct ieee80211_supported_band *sband,
 
 static void *ath_rate_alloc(struct ieee80211_hw *hw, struct dentry *debugfsdir)
 {
-        return hw->priv;
+        struct ath_wiphy *aphy = hw->priv;
+        return aphy->sc;
 }
 
 static void ath_rate_free(void *priv)
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;
diff --git a/drivers/net/wireless/ath9k/regd.c b/drivers/net/wireless/ath9k/regd.c
index f7d7cc24a129..639da975bf54 100644
--- a/drivers/net/wireless/ath9k/regd.c
+++ b/drivers/net/wireless/ath9k/regd.c
@@ -311,7 +311,8 @@ void ath9k_reg_apply_radar_flags(struct wiphy *wiphy)
 void ath9k_reg_apply_world_flags(struct wiphy *wiphy, enum reg_set_by setby)
 {
         struct ieee80211_hw *hw = wiphy_to_ieee80211_hw(wiphy);
-        struct ath_softc *sc = hw->priv;
+        struct ath_wiphy *aphy = hw->priv;
+        struct ath_softc *sc = aphy->sc;
         struct ath_hw *ah = sc->sc_ah;
 
         switch (ah->regulatory.regpair->regDmnEnum) {
@@ -332,7 +333,8 @@ void ath9k_reg_apply_world_flags(struct wiphy *wiphy, enum reg_set_by setby)
 int ath9k_reg_notifier(struct wiphy *wiphy, struct regulatory_request *request)
 {
         struct ieee80211_hw *hw = wiphy_to_ieee80211_hw(wiphy);
-        struct ath_softc *sc = hw->priv;
+        struct ath_wiphy *aphy = hw->priv;
+        struct ath_softc *sc = aphy->sc;
 
         /* We always apply this */
         ath9k_reg_apply_radar_flags(wiphy);
diff --git a/drivers/net/wireless/ath9k/virtual.c b/drivers/net/wireless/ath9k/virtual.c
index 52d5021f39f9..a91f2f1c911b 100644
--- a/drivers/net/wireless/ath9k/virtual.c
+++ b/drivers/net/wireless/ath9k/virtual.c
@@ -38,7 +38,8 @@ static void ath9k_vif_iter(void *data, u8 *mac, struct ieee80211_vif *vif)
 
 void ath9k_set_bssid_mask(struct ieee80211_hw *hw)
 {
-        struct ath_softc *sc = hw->priv;
+        struct ath_wiphy *aphy = hw->priv;
+        struct ath_softc *sc = aphy->sc;
         struct ath9k_vif_iter_data iter_data;
         int i, j;
         u8 mask[ETH_ALEN];