diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2009-11-04 08:42:28 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-11-04 18:44:48 -0500 |
commit | 5ed176e1c425f9bd1af161d66d348f6116a04fc6 (patch) | |
tree | b03b8be829a8616e6c6c2678a8c590fee889a116 /drivers/net/wireless/ath/ath9k | |
parent | 7fdad987d63f02c8fba30276ba395ac8dc93b719 (diff) |
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>
Diffstat (limited to 'drivers/net/wireless/ath/ath9k')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/recv.c | 3 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath9k/xmit.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath/ath9k/recv.c b/drivers/net/wireless/ath/ath9k/recv.c index c880a55939bf..355dd1834e1d 100644 --- a/drivers/net/wireless/ath/ath9k/recv.c +++ b/drivers/net/wireless/ath/ath9k/recv.c | |||
@@ -202,7 +202,8 @@ static int ath_rx_prepare(struct sk_buff *skb, struct ath_desc *ds, | |||
202 | } | 202 | } |
203 | 203 | ||
204 | rcu_read_lock(); | 204 | rcu_read_lock(); |
205 | sta = ieee80211_find_sta(sc->hw, hdr->addr2); | 205 | /* XXX: use ieee80211_find_sta! */ |
206 | sta = ieee80211_find_sta_by_hw(sc->hw, hdr->addr2); | ||
206 | if (sta) { | 207 | if (sta) { |
207 | an = (struct ath_node *) sta->drv_priv; | 208 | an = (struct ath_node *) sta->drv_priv; |
208 | if (ds->ds_rxstat.rs_rssi != ATH9K_RSSI_BAD && | 209 | if (ds->ds_rxstat.rs_rssi != ATH9K_RSSI_BAD && |
diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c index 2a4efcbced60..8e052f406c35 100644 --- a/drivers/net/wireless/ath/ath9k/xmit.c +++ b/drivers/net/wireless/ath/ath9k/xmit.c | |||
@@ -282,7 +282,8 @@ static void ath_tx_complete_aggr(struct ath_softc *sc, struct ath_txq *txq, | |||
282 | 282 | ||
283 | rcu_read_lock(); | 283 | rcu_read_lock(); |
284 | 284 | ||
285 | sta = ieee80211_find_sta(sc->hw, hdr->addr1); | 285 | /* XXX: use ieee80211_find_sta! */ |
286 | sta = ieee80211_find_sta_by_hw(sc->hw, hdr->addr1); | ||
286 | if (!sta) { | 287 | if (!sta) { |
287 | rcu_read_unlock(); | 288 | rcu_read_unlock(); |
288 | return; | 289 | return; |