These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / net / wireless / ath / ath9k / hw.c

diff --git a/kernel/drivers/net/wireless/ath/ath9k/hw.c b/kernel/drivers/net/wireless/ath/ath9k/hw.c
index 5e15e8e..41382f8 100644 (file)
--- a/kernel/drivers/net/wireless/ath/ath9k/hw.c
+++ b/kernel/drivers/net/wireless/ath/ath9k/hw.c
@@ -279,6 +279,7 @@ static void ath9k_hw_read_revisions(struct ath_hw *ah)
                return;
        case AR9300_DEVID_QCA956X:
                ah->hw_version.macVersion = AR_SREV_VERSION_9561;
+               return;
        }
 
        val = REG_READ(ah, AR_SREV) & AR_SREV_ID;
@@ -384,7 +385,7 @@ static void ath9k_hw_init_config(struct ath_hw *ah)
 
        ah->config.dma_beacon_response_time = 1;
        ah->config.sw_beacon_response_time = 6;
-       ah->config.cwm_ignore_extcca = 0;
+       ah->config.cwm_ignore_extcca = false;
        ah->config.analog_shiftreg = 1;
 
        ah->config.rx_intr_mitigation = true;
@@ -1240,6 +1241,7 @@ static void ath9k_hw_set_operating_mode(struct ath_hw *ah, int opmode)
                        break;
                }
                /* fall through */
+       case NL80211_IFTYPE_OCB:
        case NL80211_IFTYPE_MESH_POINT:
        case NL80211_IFTYPE_AP:
                set |= AR_STA_ID1_STA_AP;
@@ -3185,6 +3187,7 @@ static struct {
        { AR_SREV_VERSION_9550,         "9550" },
        { AR_SREV_VERSION_9565,         "9565" },
        { AR_SREV_VERSION_9531,         "9531" },
+       { AR_SREV_VERSION_9561,         "9561" },
 };
 
 /* For devices with external radios */