ath9k: Remove redundant data structure ath9k_txq_info

Use ath9k_tx_queue_info which contains the same elements,
and merge get/set functions of tx queue properties.
Also, fix whitespace damage in struct ath_softc.

Signed-off-by: Sujith Manoharan <Sujith.Manoharan@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/net/wireless/ath9k/beacon.c b/drivers/net/wireless/ath9k/beacon.c
index ba3dd253e96..6e6538b31a4 100644
--- a/drivers/net/wireless/ath9k/beacon.c
+++ b/drivers/net/wireless/ath9k/beacon.c
@@ -30,9 +30,9 @@
 static int ath_beaconq_config(struct ath_softc *sc)
 {
         struct ath_hal *ah = sc->sc_ah;
-        struct ath9k_txq_info qi;
+        struct ath9k_tx_queue_info qi;
 
-        ath9k_hw_gettxqueueprops(ah, sc->sc_bhalq, &qi);
+        ath9k_hw_get_txq_props(ah, sc->sc_bhalq, &qi);
         if (sc->sc_opmode == ATH9K_M_HOSTAP) {
                 /* Always burst out beacon and CAB traffic. */
                 qi.tqi_aifs = 1;
@@ -45,7 +45,7 @@ static int ath_beaconq_config(struct ath_softc *sc)
                 qi.tqi_cwmax = sc->sc_beacon_qi.tqi_cwmax;
         }
 
-        if (!ath9k_hw_settxqueueprops(ah, sc->sc_bhalq, &qi)) {
+        if (!ath9k_hw_set_txq_props(ah, sc->sc_bhalq, &qi)) {
                 DPRINTF(sc, ATH_DBG_FATAL,
                         "%s: unable to update h/w beacon queue parameters\n",
                         __func__);
@@ -335,7 +335,7 @@ static void ath_beacon_start_adhoc(struct ath_softc *sc, int if_id)
 
 int ath_beaconq_setup(struct ath_hal *ah)
 {
-        struct ath9k_txq_info qi;
+        struct ath9k_tx_queue_info qi;
 
         memzero(&qi, sizeof(qi));
         qi.tqi_aifs = 1;