mac80211: make ieee80211_find_sta per virtual interface

Since we have a TODO item to make all station
management dependent on virtual interfaces, I
figured I'd start with pushing such a change
to drivers before more drivers start using the
ieee80211_find_sta() API with a hw pointer and
cause us grief later on.

For now continue exporting the old API in form
of ieee80211_find_sta_by_hw(), but discourage
its use strongly.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

3 files changed, 4 insertions, 3 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-3945-rs.c b/drivers/net/wireless/iwlwifi/iwl-3945-rs.c
index 819a81bbb1b7..dc81e19674f7 100644
--- a/drivers/net/wireless/iwlwifi/iwl-3945-rs.c
+++ b/drivers/net/wireless/iwlwifi/iwl-3945-rs.c
@@ -913,7 +913,8 @@ void iwl3945_rate_scale_init(struct ieee80211_hw *hw, s32 sta_id)
 
         rcu_read_lock();
 
-        sta = ieee80211_find_sta(hw, priv->stations[sta_id].sta.sta.addr);
+        sta = ieee80211_find_sta(priv->vif,
+                                 priv->stations[sta_id].sta.sta.addr);
         if (!sta) {
                 rcu_read_unlock();
                 return;
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c
index 7373b2f50aca..e0b5b4aef41d 100644
--- a/drivers/net/wireless/iwlwifi/iwl-core.c
+++ b/drivers/net/wireless/iwlwifi/iwl-core.c
@@ -2300,7 +2300,7 @@ static void iwl_ht_conf(struct iwl_priv *priv,
         switch (priv->iw_mode) {
         case NL80211_IFTYPE_STATION:
                 rcu_read_lock();
-                sta = ieee80211_find_sta(priv->hw, priv->bssid);
+                sta = ieee80211_find_sta(priv->vif, priv->bssid);
                 if (sta) {
                         struct ieee80211_sta_ht_cap *ht_cap = &sta->ht_cap;
                         int maxstreams;
diff --git a/drivers/net/wireless/iwlwifi/iwl-sta.c b/drivers/net/wireless/iwlwifi/iwl-sta.c
index 74cc8dbe9359..eba36f737388 100644
--- a/drivers/net/wireless/iwlwifi/iwl-sta.c
+++ b/drivers/net/wireless/iwlwifi/iwl-sta.c
@@ -1017,7 +1017,7 @@ int iwl_rxon_add_station(struct iwl_priv *priv, const u8 *addr, bool is_ap)
          */
         if (priv->current_ht_config.is_ht) {
                 rcu_read_lock();
-                sta = ieee80211_find_sta(priv->hw, addr);
+                sta = ieee80211_find_sta(priv->vif, addr);
                 if (sta) {
                         memcpy(&ht_config, &sta->ht_cap, sizeof(ht_config));
                         cur_ht_config = &ht_config;