ath9k: Fix primary station configuration

Assign 'primary_sta' to the active primary station
interface after iterating over the list of interfaces.

Signed-off-by: Sujith Manoharan <[email protected]>
Signed-off-by: John W. Linville <[email protected]>

diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
index dffeffff0a0f4db0d49f135dca06ced3510d0365..6083359579744cc7064a6179ef5b4a869be725f9 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
@@ -1088,9 +1088,7 @@ void ath9k_calculate_summary_state(struct ath_softc *sc,
                        iter_data.beacons = true;
                        ath9k_set_assoc_state(sc, iter_data.primary_sta,
                                              changed);
-                       if (!ctx->primary_sta ||
-                           !ctx->primary_sta->bss_conf.assoc)
-                               ctx->primary_sta = iter_data.primary_sta;
+                       ctx->primary_sta = iter_data.primary_sta;
                } else {
                        ctx->primary_sta = NULL;
                        memset(common->curbssid, 0, ETH_ALEN);
@@ -1119,8 +1117,6 @@ void ath9k_calculate_summary_state(struct ath_softc *sc,
        else
                clear_bit(ATH_OP_PRIM_STA_VIF, &common->op_flags);
 
-       ctx->primary_sta = iter_data.primary_sta;
-
        ath9k_ps_restore(sc);
 }