ath9k: move bt_stomp_type to driver core

The bt_stomp_type defines the bt coex weight, it has a one-to-one
mapping. In the future we may want to just use the weight directly.

Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 4 insertions, 3 deletions

diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
index cd1bc9c27527..7ca6e3aa7bc4 100644
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
@@ -1391,7 +1391,7 @@ static void ath_btcoex_period_timer(unsigned long data)
 
         spin_lock_bh(&btcoex->btcoex_lock);
 
-        ath_btcoex_bt_stomp(sc, btinfo, btinfo->bt_stomp_type);
+        ath_btcoex_bt_stomp(sc, btinfo, btcoex->bt_stomp_type);
 
         spin_unlock_bh(&btcoex->btcoex_lock);
 
@@ -1426,9 +1426,9 @@ static void ath_btcoex_no_stomp_timer(void *arg)
 
         spin_lock_bh(&btcoex->btcoex_lock);
 
-        if (btinfo->bt_stomp_type == ATH_BTCOEX_STOMP_LOW)
+        if (btcoex->bt_stomp_type == ATH_BTCOEX_STOMP_LOW)
                 ath_btcoex_bt_stomp(sc, btinfo, ATH_BTCOEX_STOMP_NONE);
-         else if (btinfo->bt_stomp_type == ATH_BTCOEX_STOMP_ALL)
+         else if (btcoex->bt_stomp_type == ATH_BTCOEX_STOMP_ALL)
                 ath_btcoex_bt_stomp(sc, btinfo, ATH_BTCOEX_STOMP_LOW);
 
         spin_unlock_bh(&btcoex->btcoex_lock);
@@ -1687,6 +1687,7 @@ static int ath_init_softc(u16 devid, struct ath_softc *sc, u16 subsysid)
                         goto bad2;
                 qnum = ath_tx_get_qnum(sc, ATH9K_TX_QUEUE_DATA, ATH9K_WME_AC_BE);
                 ath9k_hw_init_btcoex_hw_info(ah, qnum);
+                sc->btcoex.bt_stomp_type = ATH_BTCOEX_STOMP_LOW;
                 break;
         default:
                 WARN_ON(1);