3 files changed, 18 insertions, 2 deletions

diff --git a/drivers/net/wireless/ath/ath9k/ar9003_mci.c b/drivers/net/wireless/ath/ath9k/ar9003_mci.c
index f6eb43ee87ee..8d8df4b2c386 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_mci.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_mci.c
@@ -1236,6 +1236,10 @@ u32 ar9003_mci_state(struct ath_hw *ah, u32 state_type)
         case MCI_STATE_NEED_FTP_STOMP:
                 value = !(mci->config & ATH_MCI_CONFIG_DISABLE_FTP_STOMP);
                 break;
+        case MCI_STATE_NEED_FLUSH_BT_INFO:
+                value = (!mci->unhalt_bt_gpm && mci->need_flush_btinfo) ? 1 : 0;
+                mci->need_flush_btinfo = false;
+                break;
         default:
                 break;
         }
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_mci.h b/drivers/net/wireless/ath/ath9k/ar9003_mci.h
index f3bef8d69edd..30acf2869aa4 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_mci.h
+++ b/drivers/net/wireless/ath/ath9k/ar9003_mci.h
@@ -200,6 +200,7 @@ enum mci_state_type {
         MCI_STATE_RECOVER_RX,
         MCI_STATE_NEED_FTP_STOMP,
         MCI_STATE_DEBUG,
+        MCI_STATE_NEED_FLUSH_BT_INFO,
         MCI_STATE_MAX
 };
 
@@ -211,7 +212,8 @@ enum mci_gpm_coex_opcode {
         MCI_GPM_COEX_WLAN_CHANNELS,
         MCI_GPM_COEX_BT_PROFILE_INFO,
         MCI_GPM_COEX_BT_STATUS_UPDATE,
-        MCI_GPM_COEX_BT_UPDATE_FLAGS
+        MCI_GPM_COEX_BT_UPDATE_FLAGS,
+        MCI_GPM_COEX_NOOP,
 };
 
 #define MCI_GPM_NOMORE  0
diff --git a/drivers/net/wireless/ath/ath9k/mci.c b/drivers/net/wireless/ath/ath9k/mci.c
index 8f0e8d9c2054..3a400c83c077 100644
--- a/drivers/net/wireless/ath/ath9k/mci.c
+++ b/drivers/net/wireless/ath/ath9k/mci.c
@@ -80,6 +80,7 @@ void ath_mci_flush_profile(struct ath_mci_profile *mci)
         struct ath_mci_profile_info *info, *tinfo;
 
         mci->aggr_limit = 0;
+        mci->num_mgmt = 0;
 
         if (list_empty(&mci->info))
                 return;
@@ -328,6 +329,13 @@ static void ath_mci_msg(struct ath_softc *sc, u8 opcode, u8 *rx_payload)
         u8 major, minor;
         u32 seq_num;
 
+        if (ar9003_mci_state(ah, MCI_STATE_NEED_FLUSH_BT_INFO) &&
+            ar9003_mci_state(ah, MCI_STATE_ENABLE)) {
+                ath_dbg(common, MCI, "(MCI) Need to flush BT profiles\n");
+                ath_mci_flush_profile(&sc->btcoex.mci);
+                ar9003_mci_state(ah, MCI_STATE_SEND_STATUS_QUERY);
+        }
+
         switch (opcode) {
         case MCI_GPM_COEX_VERSION_QUERY:
                 ar9003_mci_state(ah, MCI_STATE_SEND_WLAN_COEX_VERSION);
@@ -568,9 +576,11 @@ void ath_mci_intr(struct ath_softc *sc)
         }
 
         if ((mci_int & AR_MCI_INTERRUPT_RX_INVALID_HDR) ||
-            (mci_int & AR_MCI_INTERRUPT_CONT_INFO_TIMEOUT))
+            (mci_int & AR_MCI_INTERRUPT_CONT_INFO_TIMEOUT)) {
                 mci_int &= ~(AR_MCI_INTERRUPT_RX_INVALID_HDR |
                              AR_MCI_INTERRUPT_CONT_INFO_TIMEOUT);
+                ath_mci_msg(sc, MCI_GPM_COEX_NOOP, NULL);
+        }
 }
 
 void ath_mci_enable(struct ath_softc *sc)