mac80211: count authorized stations per BSS

Currently, each AP interface will send multicast
traffic if any interface has a station entry even
if that station entry is allocated only. With the
new station state management we can easily fix it
by adding a counter that counts each authorized
station only and send multicast traffic only when
the correct interface has at least one authorized
station.

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

1 files changed, 8 insertions, 11 deletions

diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index 50c4be9a6404..6bbd6cccb4a0 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -304,17 +304,14 @@ ieee80211_tx_h_check_assoc(struct ieee80211_tx_data *tx)
                         I802_DEBUG_INC(tx->local->tx_handlers_drop_not_assoc);
                         return TX_DROP;
                 }
-        } else {
-                if (unlikely(ieee80211_is_data(hdr->frame_control) &&
-                             tx->local->num_sta == 0 &&
-                             tx->sdata->vif.type != NL80211_IFTYPE_ADHOC)) {
-                        /*
-                         * No associated STAs - no need to send multicast
-                         * frames.
-                         */
-                        return TX_DROP;
-                }
-                return TX_CONTINUE;
+        } else if (unlikely(tx->sdata->vif.type == NL80211_IFTYPE_AP &&
+                            ieee80211_is_data(hdr->frame_control) &&
+                            !atomic_read(&tx->sdata->u.ap.num_sta_authorized))) {
+                /*
+                 * No associated STAs - no need to send multicast
+                 * frames.
+                 */
+                return TX_DROP;
         }
 
         return TX_CONTINUE;