package/mac80211/patches/543-ath9k_remove_ath_wiphy.patch

   1 --- a/drivers/net/wireless/ath/ath9k/ath9k.h
   2 +++ b/drivers/net/wireless/ath/ath9k/ath9k.h
   3 @@ -32,7 +32,6 @@
   4   */
   5
   6  struct ath_node;
   7 -struct ath_wiphy;
   8
   9  /* Macro to expand scalars to 64-bit objects */
  10
  11 @@ -391,7 +390,7 @@ struct ath_beacon {
  12
  13  void ath_beacon_tasklet(unsigned long data);
  14  void ath_beacon_config(struct ath_softc *sc, struct ieee80211_vif *vif);
  15 -int ath_beacon_alloc(struct ath_wiphy *aphy, struct ieee80211_vif *vif);
  16 +int ath_beacon_alloc(struct ath_softc *sc, struct ieee80211_vif *vif);
  17  void ath_beacon_return(struct ath_softc *sc, struct ath_vif *avp);
  18  int ath_beaconq_config(struct ath_softc *sc);
  19
  20 @@ -611,6 +610,9 @@ struct ath_softc {
  21         struct led_classdev led_cdev;
  22  #endif
  23
  24 +       struct ath9k_hw_cal_data caldata;
  25 +       int last_rssi;
  26 +
  27         int beacon_interval;
  28
  29  #ifdef CONFIG_ATH9K_DEBUGFS
  30 @@ -627,13 +629,6 @@ struct ath_softc {
  31         struct pm_qos_request_list pm_qos_req;
  32  };
  33
  34 -struct ath_wiphy {
  35 -       struct ath_softc *sc; /* shared for all virtual wiphys */
  36 -       struct ieee80211_hw *hw;
  37 -       struct ath9k_hw_cal_data caldata;
  38 -       int last_rssi;
  39 -};
  40 -
  41  void ath9k_tasklet(unsigned long data);
  42  int ath_reset(struct ath_softc *sc, bool retry_tx);
  43  int ath_cabq_update(struct ath_softc *);
  44 --- a/drivers/net/wireless/ath/ath9k/ahb.c
  45 +++ b/drivers/net/wireless/ath/ath9k/ahb.c
  46 @@ -54,7 +54,6 @@ static struct ath_bus_ops ath_ahb_bus_op
  47  static int ath_ahb_probe(struct platform_device *pdev)
  48  {
  49         void __iomem *mem;
  50 -       struct ath_wiphy *aphy;
  51         struct ath_softc *sc;
  52         struct ieee80211_hw *hw;
  53         struct resource *res;
  54 @@ -92,8 +91,7 @@ static int ath_ahb_probe(struct platform
  55
  56         irq = res->start;
  57
  58 -       hw = ieee80211_alloc_hw(sizeof(struct ath_wiphy) +
  59 -                               sizeof(struct ath_softc), &ath9k_ops);
  60 +       hw = ieee80211_alloc_hw(sizeof(struct ath_softc), &ath9k_ops);
  61         if (hw == NULL) {
  62                 dev_err(&pdev->dev, "no memory for ieee80211_hw\n");
  63                 ret = -ENOMEM;
  64 @@ -103,10 +101,7 @@ static int ath_ahb_probe(struct platform
  65         SET_IEEE80211_DEV(hw, &pdev->dev);
  66         platform_set_drvdata(pdev, hw);
  67
  68 -       aphy = hw->priv;
  69 -       sc = (struct ath_softc *) (aphy + 1);
  70 -       aphy->sc = sc;
  71 -       aphy->hw = hw;
  72 +       sc = hw->priv;
  73         sc->hw = hw;
  74         sc->dev = &pdev->dev;
  75         sc->mem = mem;
  76 @@ -150,8 +145,7 @@ static int ath_ahb_remove(struct platfor
  77         struct ieee80211_hw *hw = platform_get_drvdata(pdev);
  78
  79         if (hw) {
  80 -               struct ath_wiphy *aphy = hw->priv;
  81 -               struct ath_softc *sc = aphy->sc;
  82 +               struct ath_softc *sc = hw->priv;
  83                 void __iomem *mem = sc->mem;
  84
  85                 ath9k_deinit_device(sc);
  86 --- a/drivers/net/wireless/ath/ath9k/pci.c
  87 +++ b/drivers/net/wireless/ath/ath9k/pci.c
  88 @@ -126,7 +126,6 @@ static const struct ath_bus_ops ath_pci_
  89  static int ath_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
  90  {
  91         void __iomem *mem;
  92 -       struct ath_wiphy *aphy;
  93         struct ath_softc *sc;
  94         struct ieee80211_hw *hw;
  95         u8 csz;
  96 @@ -198,8 +197,7 @@ static int ath_pci_probe(struct pci_dev
  97                 goto err_iomap;
  98         }
  99
 100 -       hw = ieee80211_alloc_hw(sizeof(struct ath_wiphy) +
 101 -                               sizeof(struct ath_softc), &ath9k_ops);
 102 +       hw = ieee80211_alloc_hw(sizeof(struct ath_softc), &ath9k_ops);
 103         if (!hw) {
 104                 dev_err(&pdev->dev, "No memory for ieee80211_hw\n");
 105                 ret = -ENOMEM;
 106 @@ -209,10 +207,7 @@ static int ath_pci_probe(struct pci_dev
 107         SET_IEEE80211_DEV(hw, &pdev->dev);
 108         pci_set_drvdata(pdev, hw);
 109
 110 -       aphy = hw->priv;
 111 -       sc = (struct ath_softc *) (aphy + 1);
 112 -       aphy->sc = sc;
 113 -       aphy->hw = hw;
 114 +       sc = hw->priv;
 115         sc->hw = hw;
 116         sc->dev = &pdev->dev;
 117         sc->mem = mem;
 118 @@ -259,8 +254,7 @@ err_dma:
 119  static void ath_pci_remove(struct pci_dev *pdev)
 120  {
 121         struct ieee80211_hw *hw = pci_get_drvdata(pdev);
 122 -       struct ath_wiphy *aphy = hw->priv;
 123 -       struct ath_softc *sc = aphy->sc;
 124 +       struct ath_softc *sc = hw->priv;
 125         void __iomem *mem = sc->mem;
 126
 127         if (!is_ath9k_unloaded)
 128 @@ -280,8 +274,7 @@ static int ath_pci_suspend(struct device
 129  {
 130         struct pci_dev *pdev = to_pci_dev(device);
 131         struct ieee80211_hw *hw = pci_get_drvdata(pdev);
 132 -       struct ath_wiphy *aphy = hw->priv;
 133 -       struct ath_softc *sc = aphy->sc;
 134 +       struct ath_softc *sc = hw->priv;
 135
 136         ath9k_hw_set_gpio(sc->sc_ah, sc->sc_ah->led_pin, 1);
 137
 138 @@ -292,8 +285,7 @@ static int ath_pci_resume(struct device
 139  {
 140         struct pci_dev *pdev = to_pci_dev(device);
 141         struct ieee80211_hw *hw = pci_get_drvdata(pdev);
 142 -       struct ath_wiphy *aphy = hw->priv;
 143 -       struct ath_softc *sc = aphy->sc;
 144 +       struct ath_softc *sc = hw->priv;
 145         u32 val;
 146
 147         /*
 148 --- a/drivers/net/wireless/ath/ath9k/beacon.c
 149 +++ b/drivers/net/wireless/ath/ath9k/beacon.c
 150 @@ -112,8 +112,7 @@ static void ath_beacon_setup(struct ath_
 151
 152  static void ath_tx_cabq(struct ieee80211_hw *hw, struct sk_buff *skb)
 153  {
 154 -       struct ath_wiphy *aphy = hw->priv;
 155 -       struct ath_softc *sc = aphy->sc;
 156 +       struct ath_softc *sc = hw->priv;
 157         struct ath_common *common = ath9k_hw_common(sc->sc_ah);
 158         struct ath_tx_control txctl;
 159
 160 @@ -132,8 +131,7 @@ static void ath_tx_cabq(struct ieee80211
 161  static struct ath_buf *ath_beacon_generate(struct ieee80211_hw *hw,
 162                                            struct ieee80211_vif *vif)
 163  {
 164 -       struct ath_wiphy *aphy = hw->priv;
 165 -       struct ath_softc *sc = aphy->sc;
 166 +       struct ath_softc *sc = hw->priv;
 167         struct ath_common *common = ath9k_hw_common(sc->sc_ah);
 168         struct ath_buf *bf;
 169         struct ath_vif *avp;
 170 @@ -222,9 +220,8 @@ static struct ath_buf *ath_beacon_genera
 171         return bf;
 172  }
 173
 174 -int ath_beacon_alloc(struct ath_wiphy *aphy, struct ieee80211_vif *vif)
 175 +int ath_beacon_alloc(struct ath_softc *sc, struct ieee80211_vif *vif)
 176  {
 177 -       struct ath_softc *sc = aphy->sc;
 178         struct ath_common *common = ath9k_hw_common(sc->sc_ah);
 179         struct ath_vif *avp;
 180         struct ath_buf *bf;
 181 --- a/drivers/net/wireless/ath/ath9k/gpio.c
 182 +++ b/drivers/net/wireless/ath/ath9k/gpio.c
 183 @@ -88,8 +88,7 @@ static bool ath_is_rfkill_set(struct ath
 184
 185  void ath9k_rfkill_poll_state(struct ieee80211_hw *hw)
 186  {
 187 -       struct ath_wiphy *aphy = hw->priv;
 188 -       struct ath_softc *sc = aphy->sc;
 189 +       struct ath_softc *sc = hw->priv;
 190         bool blocked = !!ath_is_rfkill_set(sc);
 191
 192         wiphy_rfkill_set_hw_state(hw->wiphy, blocked);
 193 --- a/drivers/net/wireless/ath/ath9k/init.c
 194 +++ b/drivers/net/wireless/ath/ath9k/init.c
 195 @@ -270,8 +270,7 @@ static int ath9k_reg_notifier(struct wip
 196                               struct regulatory_request *request)
 197  {
 198         struct ieee80211_hw *hw = wiphy_to_ieee80211_hw(wiphy);
 199 -       struct ath_wiphy *aphy = hw->priv;
 200 -       struct ath_softc *sc = aphy->sc;
 201 +       struct ath_softc *sc = hw->priv;
 202         struct ath_regulatory *reg = ath9k_hw_regulatory(sc->sc_ah);
 203
 204         return ath_reg_notifier_apply(wiphy, request, reg);
 205 @@ -724,7 +723,6 @@ int ath9k_init_device(u16 devid, struct
 206                     const struct ath_bus_ops *bus_ops)
 207  {
 208         struct ieee80211_hw *hw = sc->hw;
 209 -       struct ath_wiphy *aphy = hw->priv;
 210         struct ath_common *common;
 211         struct ath_hw *ah;
 212         int error = 0;
 213 @@ -786,7 +784,7 @@ int ath9k_init_device(u16 devid, struct
 214
 215         INIT_WORK(&sc->hw_check_work, ath_hw_check);
 216         INIT_WORK(&sc->paprd_work, ath_paprd_calibrate);
 217 -       aphy->last_rssi = ATH_RSSI_DUMMY_MARKER;
 218 +       sc->last_rssi = ATH_RSSI_DUMMY_MARKER;
 219
 220         ath_init_leds(sc);
 221         ath_start_rfkill_poll(sc);
 222 --- a/drivers/net/wireless/ath/ath9k/main.c
 223 +++ b/drivers/net/wireless/ath/ath9k/main.c
 224 @@ -215,7 +215,6 @@ static void ath_update_survey_stats(stru
 225  int ath_set_channel(struct ath_softc *sc, struct ieee80211_hw *hw,
 226                     struct ath9k_channel *hchan)
 227  {
 228 -       struct ath_wiphy *aphy = hw->priv;
 229         struct ath_hw *ah = sc->sc_ah;
 230         struct ath_common *common = ath9k_hw_common(ah);
 231         struct ieee80211_conf *conf = &common->hw->conf;
 232 @@ -262,7 +261,7 @@ int ath_set_channel(struct ath_softc *sc
 233                 fastcc = false;
 234
 235         if (!(sc->sc_flags & SC_OP_OFFCHANNEL))
 236 -               caldata = &aphy->caldata;
 237 +               caldata = &sc->caldata;
 238
 239         ath_dbg(common, ATH_DBG_CONFIG,
 240                 "(%u MHz) -> (%u MHz), conf_is_ht40: %d fastcc: %d\n",
 241 @@ -841,7 +840,6 @@ static void ath9k_bss_assoc_info(struct
 242                                  struct ieee80211_vif *vif,
 243                                  struct ieee80211_bss_conf *bss_conf)
 244  {
 245 -       struct ath_wiphy *aphy = hw->priv;
 246         struct ath_hw *ah = sc->sc_ah;
 247         struct ath_common *common = ath9k_hw_common(ah);
 248
 249 @@ -865,7 +863,7 @@ static void ath9k_bss_assoc_info(struct
 250                 ath_beacon_config(sc, vif);
 251
 252                 /* Reset rssi stats */
 253 -               aphy->last_rssi = ATH_RSSI_DUMMY_MARKER;
 254 +               sc->last_rssi = ATH_RSSI_DUMMY_MARKER;
 255                 sc->sc_ah->stats.avgbrssi = ATH_RSSI_DUMMY_MARKER;
 256
 257                 sc->sc_flags |= SC_OP_ANI_RUN;
 258 @@ -1062,8 +1060,7 @@ void ath9k_update_ichannel(struct ath_so
 259
 260  static int ath9k_start(struct ieee80211_hw *hw)
 261  {
 262 -       struct ath_wiphy *aphy = hw->priv;
 263 -       struct ath_softc *sc = aphy->sc;
 264 +       struct ath_softc *sc = hw->priv;
 265         struct ath_hw *ah = sc->sc_ah;
 266         struct ath_common *common = ath9k_hw_common(ah);
 267         struct ieee80211_channel *curchan = hw->conf.channel;
 268 @@ -1180,8 +1177,7 @@ mutex_unlock:
 269  static int ath9k_tx(struct ieee80211_hw *hw,
 270                     struct sk_buff *skb)
 271  {
 272 -       struct ath_wiphy *aphy = hw->priv;
 273 -       struct ath_softc *sc = aphy->sc;
 274 +       struct ath_softc *sc = hw->priv;
 275         struct ath_common *common = ath9k_hw_common(sc->sc_ah);
 276         struct ath_tx_control txctl;
 277         struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
 278 @@ -1244,8 +1240,7 @@ exit:
 279
 280  static void ath9k_stop(struct ieee80211_hw *hw)
 281  {
 282 -       struct ath_wiphy *aphy = hw->priv;
 283 -       struct ath_softc *sc = aphy->sc;
 284 +       struct ath_softc *sc = hw->priv;
 285         struct ath_hw *ah = sc->sc_ah;
 286         struct ath_common *common = ath9k_hw_common(ah);
 287
 288 @@ -1377,8 +1372,7 @@ void ath9k_calculate_iter_data(struct ie
 289                                struct ieee80211_vif *vif,
 290                                struct ath9k_vif_iter_data *iter_data)
 291  {
 292 -       struct ath_wiphy *aphy = hw->priv;
 293 -       struct ath_softc *sc = aphy->sc;
 294 +       struct ath_softc *sc = hw->priv;
 295         struct ath_hw *ah = sc->sc_ah;
 296         struct ath_common *common = ath9k_hw_common(ah);
 297
 298 @@ -1402,8 +1396,7 @@ void ath9k_calculate_iter_data(struct ie
 299  static void ath9k_calculate_summary_state(struct ieee80211_hw *hw,
 300                                           struct ieee80211_vif *vif)
 301  {
 302 -       struct ath_wiphy *aphy = hw->priv;
 303 -       struct ath_softc *sc = aphy->sc;
 304 +       struct ath_softc *sc = hw->priv;
 305         struct ath_hw *ah = sc->sc_ah;
 306         struct ath_common *common = ath9k_hw_common(ah);
 307         struct ath9k_vif_iter_data iter_data;
 308 @@ -1459,8 +1452,7 @@ static void ath9k_calculate_summary_stat
 309  static void ath9k_do_vif_add_setup(struct ieee80211_hw *hw,
 310                                    struct ieee80211_vif *vif)
 311  {
 312 -       struct ath_wiphy *aphy = hw->priv;
 313 -       struct ath_softc *sc = aphy->sc;
 314 +       struct ath_softc *sc = hw->priv;
 315
 316         ath9k_calculate_summary_state(hw, vif);
 317
 318 @@ -1473,7 +1465,7 @@ static void ath9k_do_vif_add_setup(struc
 319                  * in the info_changed method and set up beacons properly
 320                  * there.
 321                  */
 322 -               error = ath_beacon_alloc(aphy, vif);
 323 +               error = ath_beacon_alloc(sc, vif);
 324                 if (error)
 325                         ath9k_reclaim_beacon(sc, vif);
 326                 else
 327 @@ -1485,8 +1477,7 @@ static void ath9k_do_vif_add_setup(struc
 328  static int ath9k_add_interface(struct ieee80211_hw *hw,
 329                                struct ieee80211_vif *vif)
 330  {
 331 -       struct ath_wiphy *aphy = hw->priv;
 332 -       struct ath_softc *sc = aphy->sc;
 333 +       struct ath_softc *sc = hw->priv;
 334         struct ath_hw *ah = sc->sc_ah;
 335         struct ath_common *common = ath9k_hw_common(ah);
 336         struct ath_vif *avp = (void *)vif->drv_priv;
 337 @@ -1546,8 +1537,7 @@ static int ath9k_change_interface(struct
 338                                   enum nl80211_iftype new_type,
 339                                   bool p2p)
 340  {
 341 -       struct ath_wiphy *aphy = hw->priv;
 342 -       struct ath_softc *sc = aphy->sc;
 343 +       struct ath_softc *sc = hw->priv;
 344         struct ath_common *common = ath9k_hw_common(sc->sc_ah);
 345         int ret = 0;
 346
 347 @@ -1589,8 +1579,7 @@ out:
 348  static void ath9k_remove_interface(struct ieee80211_hw *hw,
 349                                    struct ieee80211_vif *vif)
 350  {
 351 -       struct ath_wiphy *aphy = hw->priv;
 352 -       struct ath_softc *sc = aphy->sc;
 353 +       struct ath_softc *sc = hw->priv;
 354         struct ath_common *common = ath9k_hw_common(sc->sc_ah);
 355
 356         ath_dbg(common, ATH_DBG_CONFIG, "Detach Interface\n");
 357 @@ -1644,8 +1633,7 @@ static void ath9k_disable_ps(struct ath_
 358
 359  static int ath9k_config(struct ieee80211_hw *hw, u32 changed)
 360  {
 361 -       struct ath_wiphy *aphy = hw->priv;
 362 -       struct ath_softc *sc = aphy->sc;
 363 +       struct ath_softc *sc = hw->priv;
 364         struct ath_hw *ah = sc->sc_ah;
 365         struct ath_common *common = ath9k_hw_common(ah);
 366         struct ieee80211_conf *conf = &hw->conf;
 367 @@ -1789,8 +1777,7 @@ static void ath9k_configure_filter(struc
 368                                    unsigned int *total_flags,
 369                                    u64 multicast)
 370  {
 371 -       struct ath_wiphy *aphy = hw->priv;
 372 -       struct ath_softc *sc = aphy->sc;
 373 +       struct ath_softc *sc = hw->priv;
 374         u32 rfilt;
 375
 376         changed_flags &= SUPPORTED_FILTERS;
 377 @@ -1810,8 +1797,7 @@ static int ath9k_sta_add(struct ieee8021
 378                          struct ieee80211_vif *vif,
 379                          struct ieee80211_sta *sta)
 380  {
 381 -       struct ath_wiphy *aphy = hw->priv;
 382 -       struct ath_softc *sc = aphy->sc;
 383 +       struct ath_softc *sc = hw->priv;
 384
 385         ath_node_attach(sc, sta);
 386
 387 @@ -1822,8 +1808,7 @@ static int ath9k_sta_remove(struct ieee8
 388                             struct ieee80211_vif *vif,
 389                             struct ieee80211_sta *sta)
 390  {
 391 -       struct ath_wiphy *aphy = hw->priv;
 392 -       struct ath_softc *sc = aphy->sc;
 393 +       struct ath_softc *sc = hw->priv;
 394
 395         ath_node_detach(sc, sta);
 396
 397 @@ -1833,8 +1818,7 @@ static int ath9k_sta_remove(struct ieee8
 398  static int ath9k_conf_tx(struct ieee80211_hw *hw, u16 queue,
 399                          const struct ieee80211_tx_queue_params *params)
 400  {
 401 -       struct ath_wiphy *aphy = hw->priv;
 402 -       struct ath_softc *sc = aphy->sc;
 403 +       struct ath_softc *sc = hw->priv;
 404         struct ath_common *common = ath9k_hw_common(sc->sc_ah);
 405         struct ath_txq *txq;
 406         struct ath9k_tx_queue_info qi;
 407 @@ -1878,8 +1862,7 @@ static int ath9k_set_key(struct ieee8021
 408                          struct ieee80211_sta *sta,
 409                          struct ieee80211_key_conf *key)
 410  {
 411 -       struct ath_wiphy *aphy = hw->priv;
 412 -       struct ath_softc *sc = aphy->sc;
 413 +       struct ath_softc *sc = hw->priv;
 414         struct ath_common *common = ath9k_hw_common(sc->sc_ah);
 415         int ret = 0;
 416
 417 @@ -1923,8 +1906,7 @@ static void ath9k_bss_info_changed(struc
 418                                    struct ieee80211_bss_conf *bss_conf,
 419                                    u32 changed)
 420  {
 421 -       struct ath_wiphy *aphy = hw->priv;
 422 -       struct ath_softc *sc = aphy->sc;
 423 +       struct ath_softc *sc = hw->priv;
 424         struct ath_hw *ah = sc->sc_ah;
 425         struct ath_common *common = ath9k_hw_common(ah);
 426         struct ath_vif *avp = (void *)vif->drv_priv;
 427 @@ -1954,7 +1936,7 @@ static void ath9k_bss_info_changed(struc
 428         if ((changed & BSS_CHANGED_BEACON) ||
 429             ((changed & BSS_CHANGED_BEACON_ENABLED) && bss_conf->enable_beacon)) {
 430                 ath9k_hw_stoptxdma(sc->sc_ah, sc->beacon.beaconq);
 431 -               error = ath_beacon_alloc(aphy, vif);
 432 +               error = ath_beacon_alloc(sc, vif);
 433                 if (!error)
 434                         ath_beacon_config(sc, vif);
 435         }
 436 @@ -1991,7 +1973,7 @@ static void ath9k_bss_info_changed(struc
 437                 if (vif->type == NL80211_IFTYPE_AP) {
 438                         sc->sc_flags |= SC_OP_TSF_RESET;
 439                         ath9k_hw_stoptxdma(sc->sc_ah, sc->beacon.beaconq);
 440 -                       error = ath_beacon_alloc(aphy, vif);
 441 +                       error = ath_beacon_alloc(sc, vif);
 442                         if (!error)
 443                                 ath_beacon_config(sc, vif);
 444                 } else {
 445 @@ -2029,9 +2011,8 @@ static void ath9k_bss_info_changed(struc
 446
 447  static u64 ath9k_get_tsf(struct ieee80211_hw *hw)
 448  {
 449 +       struct ath_softc *sc = hw->priv;
 450         u64 tsf;
 451 -       struct ath_wiphy *aphy = hw->priv;
 452 -       struct ath_softc *sc = aphy->sc;
 453
 454         mutex_lock(&sc->mutex);
 455         ath9k_ps_wakeup(sc);
 456 @@ -2044,8 +2025,7 @@ static u64 ath9k_get_tsf(struct ieee8021
 457
 458  static void ath9k_set_tsf(struct ieee80211_hw *hw, u64 tsf)
 459  {
 460 -       struct ath_wiphy *aphy = hw->priv;
 461 -       struct ath_softc *sc = aphy->sc;
 462 +       struct ath_softc *sc = hw->priv;
 463
 464         mutex_lock(&sc->mutex);
 465         ath9k_ps_wakeup(sc);
 466 @@ -2056,8 +2036,7 @@ static void ath9k_set_tsf(struct ieee802
 467
 468  static void ath9k_reset_tsf(struct ieee80211_hw *hw)
 469  {
 470 -       struct ath_wiphy *aphy = hw->priv;
 471 -       struct ath_softc *sc = aphy->sc;
 472 +       struct ath_softc *sc = hw->priv;
 473
 474         mutex_lock(&sc->mutex);
 475
 476 @@ -2074,8 +2053,7 @@ static int ath9k_ampdu_action(struct iee
 477                               struct ieee80211_sta *sta,
 478                               u16 tid, u16 *ssn, u8 buf_size)
 479  {
 480 -       struct ath_wiphy *aphy = hw->priv;
 481 -       struct ath_softc *sc = aphy->sc;
 482 +       struct ath_softc *sc = hw->priv;
 483         int ret = 0;
 484
 485         local_bh_disable();
 486 @@ -2120,8 +2098,7 @@ static int ath9k_ampdu_action(struct iee
 487  static int ath9k_get_survey(struct ieee80211_hw *hw, int idx,
 488                              struct survey_info *survey)
 489  {
 490 -       struct ath_wiphy *aphy = hw->priv;
 491 -       struct ath_softc *sc = aphy->sc;
 492 +       struct ath_softc *sc = hw->priv;
 493         struct ath_common *common = ath9k_hw_common(sc->sc_ah);
 494         struct ieee80211_supported_band *sband;
 495         struct ieee80211_channel *chan;
 496 @@ -2157,8 +2134,7 @@ static int ath9k_get_survey(struct ieee8
 497
 498  static void ath9k_set_coverage_class(struct ieee80211_hw *hw, u8 coverage_class)
 499  {
 500 -       struct ath_wiphy *aphy = hw->priv;
 501 -       struct ath_softc *sc = aphy->sc;
 502 +       struct ath_softc *sc = hw->priv;
 503         struct ath_hw *ah = sc->sc_ah;
 504
 505         mutex_lock(&sc->mutex);
 506 --- a/drivers/net/wireless/ath/ath9k/rc.c
 507 +++ b/drivers/net/wireless/ath/ath9k/rc.c
 508 @@ -1560,8 +1560,7 @@ static void ath_rate_add_sta_debugfs(voi
 509
 510  static void *ath_rate_alloc(struct ieee80211_hw *hw, struct dentry *debugfsdir)
 511  {
 512 -       struct ath_wiphy *aphy = hw->priv;
 513 -       return aphy->sc;
 514 +       return hw->priv;
 515  }
 516
 517  static void ath_rate_free(void *priv)
 518 --- a/drivers/net/wireless/ath/ath9k/recv.c
 519 +++ b/drivers/net/wireless/ath/ath9k/recv.c
 520 @@ -927,7 +927,7 @@ static void ath9k_process_rssi(struct at
 521                                struct ieee80211_hdr *hdr,
 522                                struct ath_rx_status *rx_stats)
 523  {
 524 -       struct ath_wiphy *aphy = hw->priv;
 525 +       struct ath_softc *sc = hw->priv;
 526         struct ath_hw *ah = common->ah;
 527         int last_rssi;
 528         __le16 fc;
 529 @@ -947,9 +947,9 @@ static void ath9k_process_rssi(struct at
 530         }
 531
 532         if (rx_stats->rs_rssi != ATH9K_RSSI_BAD && !rx_stats->rs_moreaggr)
 533 -               ATH_RSSI_LPF(aphy->last_rssi, rx_stats->rs_rssi);
 534 +               ATH_RSSI_LPF(sc->last_rssi, rx_stats->rs_rssi);
 535
 536 -       last_rssi = aphy->last_rssi;
 537 +       last_rssi = sc->last_rssi;
 538         if (likely(last_rssi != ATH_RSSI_DUMMY_MARKER))
 539                 rx_stats->rs_rssi = ATH_EP_RND(last_rssi,
 540                                               ATH_RSSI_EP_MULTIPLIER);
 541 --- a/drivers/net/wireless/ath/ath9k/xmit.c
 542 +++ b/drivers/net/wireless/ath/ath9k/xmit.c
 543 @@ -1440,8 +1440,7 @@ static enum ath9k_pkt_type get_hw_packet
 544  static void setup_frame_info(struct ieee80211_hw *hw, struct sk_buff *skb,
 545                              int framelen)
 546  {
 547 -       struct ath_wiphy *aphy = hw->priv;
 548 -       struct ath_softc *sc = aphy->sc;
 549 +       struct ath_softc *sc = hw->priv;
 550         struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb);
 551         struct ieee80211_sta *sta = tx_info->control.sta;
 552         struct ieee80211_key_conf *hw_key = tx_info->control.hw_key;
 553 @@ -1659,8 +1658,7 @@ static struct ath_buf *ath_tx_setup_buff
 554                                            struct ath_txq *txq,
 555                                            struct sk_buff *skb)
 556  {
 557 -       struct ath_wiphy *aphy = hw->priv;
 558 -       struct ath_softc *sc = aphy->sc;
 559 +       struct ath_softc *sc = hw->priv;
 560         struct ath_hw *ah = sc->sc_ah;
 561         struct ath_common *common = ath9k_hw_common(sc->sc_ah);
 562         struct ath_frame_info *fi = get_frame_info(skb);
 563 @@ -1761,8 +1759,7 @@ int ath_tx_start(struct ieee80211_hw *hw
 564         struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
 565         struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
 566         struct ieee80211_sta *sta = info->control.sta;
 567 -       struct ath_wiphy *aphy = hw->priv;
 568 -       struct ath_softc *sc = aphy->sc;
 569 +       struct ath_softc *sc = hw->priv;
 570         struct ath_txq *txq = txctl->txq;
 571         struct ath_buf *bf;
 572         int padpos, padsize;