diff options
author | Oleksij Rempel <linux@rempel-privat.de> | 2014-03-01 15:15:50 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2014-03-17 13:13:06 -0400 |
commit | c35ccb38d49fb08c6fe84553905a7e2d2b7c4407 (patch) | |
tree | c89c1fb73988978d6a8525cbf55814a36dead47c /drivers/net/wireless/ath | |
parent | 92c3f7ef2c59de5c6b58504d330a59f8e8d78e88 (diff) |
ath9k_htc: add ATH_OP_PRIM_STA_VIF
we will need it to make common-beacon code work.
Signed-off-by: Oleksij Rempel <linux@rempel-privat.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/htc_drv_main.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_main.c b/drivers/net/wireless/ath/ath9k/htc_drv_main.c index 6e17c08422c0..b82a7c43eb6e 100644 --- a/drivers/net/wireless/ath/ath9k/htc_drv_main.c +++ b/drivers/net/wireless/ath/ath9k/htc_drv_main.c | |||
@@ -1478,6 +1478,7 @@ static void ath9k_htc_bss_iter(void *data, u8 *mac, struct ieee80211_vif *vif) | |||
1478 | common->curaid = bss_conf->aid; | 1478 | common->curaid = bss_conf->aid; |
1479 | common->last_rssi = ATH_RSSI_DUMMY_MARKER; | 1479 | common->last_rssi = ATH_RSSI_DUMMY_MARKER; |
1480 | memcpy(common->curbssid, bss_conf->bssid, ETH_ALEN); | 1480 | memcpy(common->curbssid, bss_conf->bssid, ETH_ALEN); |
1481 | set_bit(ATH_OP_PRIM_STA_VIF, &common->op_flags); | ||
1481 | } | 1482 | } |
1482 | } | 1483 | } |
1483 | 1484 | ||
@@ -1510,6 +1511,9 @@ static void ath9k_htc_bss_info_changed(struct ieee80211_hw *hw, | |||
1510 | bss_conf->assoc ? | 1511 | bss_conf->assoc ? |
1511 | priv->num_sta_assoc_vif++ : priv->num_sta_assoc_vif--; | 1512 | priv->num_sta_assoc_vif++ : priv->num_sta_assoc_vif--; |
1512 | 1513 | ||
1514 | if (!bss_conf->assoc) | ||
1515 | clear_bit(ATH_OP_PRIM_STA_VIF, &common->op_flags); | ||
1516 | |||
1513 | if (priv->ah->opmode == NL80211_IFTYPE_STATION) { | 1517 | if (priv->ah->opmode == NL80211_IFTYPE_STATION) { |
1514 | ath9k_htc_choose_set_bssid(priv); | 1518 | ath9k_htc_choose_set_bssid(priv); |
1515 | if (bss_conf->assoc && (priv->num_sta_assoc_vif == 1)) | 1519 | if (bss_conf->assoc && (priv->num_sta_assoc_vif == 1)) |