提交 92445c95 编写于 作者: J Johannes Berg 提交者: Reinette Chatre

iwlwifi: use vif iwl_bss_info_changed

The iw_mode will always follow the only vif we
have, but using the vif directly seems easier.
Signed-off-by: NJohannes Berg <johannes.berg@intel.com>
Signed-off-by: NReinette Chatre <reinette.chatre@intel.com>
上级 683abfbe
...@@ -1857,8 +1857,7 @@ void iwl_bss_info_changed(struct ieee80211_hw *hw, ...@@ -1857,8 +1857,7 @@ void iwl_bss_info_changed(struct ieee80211_hw *hw,
mutex_lock(&priv->mutex); mutex_lock(&priv->mutex);
if (changes & BSS_CHANGED_BEACON && if (changes & BSS_CHANGED_BEACON && vif->type == NL80211_IFTYPE_AP) {
priv->iw_mode == NL80211_IFTYPE_AP) {
dev_kfree_skb(priv->ibss_beacon); dev_kfree_skb(priv->ibss_beacon);
priv->ibss_beacon = ieee80211_beacon_get(hw, vif); priv->ibss_beacon = ieee80211_beacon_get(hw, vif);
} }
...@@ -1884,8 +1883,7 @@ void iwl_bss_info_changed(struct ieee80211_hw *hw, ...@@ -1884,8 +1883,7 @@ void iwl_bss_info_changed(struct ieee80211_hw *hw,
} }
/* mac80211 only sets assoc when in STATION mode */ /* mac80211 only sets assoc when in STATION mode */
if (priv->iw_mode == NL80211_IFTYPE_ADHOC || if (vif->type == NL80211_IFTYPE_ADHOC || bss_conf->assoc) {
bss_conf->assoc) {
memcpy(priv->staging_rxon.bssid_addr, memcpy(priv->staging_rxon.bssid_addr,
bss_conf->bssid, ETH_ALEN); bss_conf->bssid, ETH_ALEN);
...@@ -1903,7 +1901,7 @@ void iwl_bss_info_changed(struct ieee80211_hw *hw, ...@@ -1903,7 +1901,7 @@ void iwl_bss_info_changed(struct ieee80211_hw *hw,
* mac80211 decides to do both changes at once because * mac80211 decides to do both changes at once because
* it will invoke post_associate. * it will invoke post_associate.
*/ */
if (priv->iw_mode == NL80211_IFTYPE_ADHOC && if (vif->type == NL80211_IFTYPE_ADHOC &&
changes & BSS_CHANGED_BEACON) { changes & BSS_CHANGED_BEACON) {
struct sk_buff *beacon = ieee80211_beacon_get(hw, vif); struct sk_buff *beacon = ieee80211_beacon_get(hw, vif);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册