Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5ed176e1 authored Nov 04, 2009 by Johannes Berg Committed by John W. Linville Nov 04, 2009

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>

parent 7fdad987

drivers/net/wireless/ath/ath9k/recv.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -202,7 +202,8 @@ static int ath_rx_prepare(struct sk_buff skb, struct ath_desc ds,
		}

		rcu_read_lock();
		sta = ieee80211_find_sta(sc->hw, hdr->addr2);
		/* XXX: use ieee80211_find_sta! */
		sta = ieee80211_find_sta_by_hw(sc->hw, hdr->addr2);
		if (sta) {
		an = (struct ath_node *) sta->drv_priv;
		if (ds->ds_rxstat.rs_rssi != ATH9K_RSSI_BAD &&

drivers/net/wireless/ath/ath9k/xmit.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -282,7 +282,8 @@ static void ath_tx_complete_aggr(struct ath_softc sc, struct ath_txq txq,

		rcu_read_lock();

		sta = ieee80211_find_sta(sc->hw, hdr->addr1);
		/* XXX: use ieee80211_find_sta! */
		sta = ieee80211_find_sta_by_hw(sc->hw, hdr->addr1);
		if (!sta) {
		rcu_read_unlock();
		return;

drivers/net/wireless/iwlwifi/iwl-3945-rs.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -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;

drivers/net/wireless/iwlwifi/iwl-core.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;

drivers/net/wireless/iwlwifi/iwl-sta.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;