[mac80211/ath9k] mac80211/ath9k: Support AMPDU with multiple VIFs.

Commit Message

Ben Greear Sept. 21, 2010, 6:57 p.m. UTC

None

Patch

diff --git a/drivers/net/wireless/ath/ath9k/recv.c b/drivers/net/wireless/ath/ath9k/recv.c
index c5e7af4..2628d8f 100644
--- a/drivers/net/wireless/ath/ath9k/recv.c
+++ b/drivers/net/wireless/ath/ath9k/recv.c
@@ -959,7 +959,8 @@  static int ath9k_process_rate(struct ath_common *common,
 static void ath9k_process_rssi(struct ath_common *common,
 			       struct ieee80211_hw *hw,
 			       struct ieee80211_hdr *hdr,
-			       struct ath_rx_status *rx_stats)
+			       struct ath_rx_status *rx_stats,
+			       struct net_device *dev)
 {
 	struct ath_hw *ah = common->ah;
 	struct ieee80211_sta *sta;
@@ -977,7 +978,7 @@  static void ath9k_process_rssi(struct ath_common *common,
 	 * at least one sdata of a wiphy on mac80211 but with ath9k virtual
 	 * wiphy you'd have to iterate over every wiphy and each sdata.
 	 */
-	sta = ieee80211_find_sta_by_hw(hw, hdr->addr2);
+	sta = ieee80211_find_sta_by_hw(hw, hdr->addr2, dev);
 	if (sta) {
 		an = (struct ath_node *) sta->drv_priv;
 		if (rx_stats->rs_rssi != ATH9K_RSSI_BAD &&
@@ -1008,7 +1009,8 @@  static int ath9k_rx_skb_preprocess(struct ath_common *common,
 				   struct ieee80211_hdr *hdr,
 				   struct ath_rx_status *rx_stats,
 				   struct ieee80211_rx_status *rx_status,
-				   bool *decrypt_error)
+				   bool *decrypt_error,
+				   struct net_device *dev)
 {
 	memset(rx_status, 0, sizeof(struct ieee80211_rx_status));
 
@@ -1019,7 +1021,7 @@  static int ath9k_rx_skb_preprocess(struct ath_common *common,
 	if (!ath9k_rx_accept(common, hdr, rx_status, rx_stats, decrypt_error))
 		return -EINVAL;
 
-	ath9k_process_rssi(common, hw, hdr, rx_stats);
+	ath9k_process_rssi(common, hw, hdr, rx_stats, dev);
 
 	if (ath9k_process_rate(common, hw, rx_stats, rx_status))
 		return -EINVAL;
@@ -1686,7 +1688,7 @@  int ath_rx_tasklet(struct ath_softc *sc, int flush, bool hp)
 			goto requeue;
 
 		retval = ath9k_rx_skb_preprocess(common, hw, hdr, &rs,
-						 rxs, &decrypt_error);
+						 rxs, &decrypt_error, skb->dev);
 		if (retval)
 			goto requeue;
 
diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c
index 85a7323..aef60ea 100644
--- a/drivers/net/wireless/ath/ath9k/xmit.c
+++ b/drivers/net/wireless/ath/ath9k/xmit.c
@@ -328,8 +328,7 @@  static void ath_tx_complete_aggr(struct ath_softc *sc, struct ath_txq *txq,
 
 	rcu_read_lock();
 
-	/* XXX: use ieee80211_find_sta! */
-	sta = ieee80211_find_sta_by_hw(hw, hdr->addr1);
+	sta = ieee80211_find_sta_by_hw(hw, hdr->addr1, skb->dev);
 	if (!sta) {
 		rcu_read_unlock();
 
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index 12a49f0..63df108 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -2420,21 +2420,16 @@  struct ieee80211_sta *ieee80211_find_sta(struct ieee80211_vif *vif,
  *
  * @hw: pointer as obtained from ieee80211_alloc_hw()
  * @addr: station's address
+ * @dev:  Netdevice to differentiate between multiple VIFs with same STA addr.
  *
  * This function must be called under RCU lock and the
  * resulting pointer is only valid under RCU lock as well.
  *
- * NOTE: This function should not be used! When mac80211 is converted
- *	 internally to properly keep track of stations on multiple
- *	 virtual interfaces, it will not always know which station to
- *	 return here since a single address might be used by multiple
- *	 logical stations (e.g. consider a station connecting to another
- *	 BSSID on the same AP hardware without disconnecting first).
- *
- * DO NOT USE THIS FUNCTION.
  */
 struct ieee80211_sta *ieee80211_find_sta_by_hw(struct ieee80211_hw *hw,
-					       const u8 *addr);
+					       const u8 *addr,
+					       struct net_device *dev);
+
 
 /**
  * ieee80211_sta_block_awake - block station from waking up
diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c
index 44e10a9..f745497 100644
--- a/net/mac80211/sta_info.c
+++ b/net/mac80211/sta_info.c
@@ -839,15 +839,17 @@  void ieee80211_sta_expire(struct ieee80211_sub_if_data *sdata,
 }
 
 struct ieee80211_sta *ieee80211_find_sta_by_hw(struct ieee80211_hw *hw,
-					       const u8 *addr)
+					       const u8 *addr,
+					       struct net_device *dev)
 {
 	struct sta_info *sta, *nxt;
 
-	/* Just return a random station ... first in list ... */
 	for_each_sta_info(hw_to_local(hw), addr, sta, nxt) {
-		if (!sta->uploaded)
-			return NULL;
-		return &sta->sta;
+		if (sta->sdata->dev == dev) {
+			if (!sta->uploaded)
+				return NULL;
+			return &sta->sta;
+		}
 	}
 
 	return NULL;