mac80211: suppress 3-address multicast frames on WDS APs without non-WDS stations

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31429 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/mac80211/patches/300-pending_work.patch b/package/mac80211/patches/300-pending_work.patch
index 333cda5..0ffa61d 100644 (file)
--- a/package/mac80211/patches/300-pending_work.patch
+++ b/package/mac80211/patches/300-pending_work.patch
@@ -812,3 +812,77 @@
                !(rx_stats->rs_status &
                (ATH9K_RXERR_DECRYPT | ATH9K_RXERR_CRC | ATH9K_RXERR_MIC |
                 ATH9K_RXERR_KEYMISS));
+--- a/net/mac80211/cfg.c
++++ b/net/mac80211/cfg.c
+@@ -1023,6 +1023,10 @@ static int ieee80211_change_station(stru
+               }
+ 
+               sta->sdata = vlansdata;
++
++              if (sta->sta_state == IEEE80211_STA_AUTHORIZED)
++                      atomic_dec(&sta->sdata->u.ap.num_mcast_sta);
++
+               ieee80211_send_layer2_update(sta);
+       }
+ 
+--- a/net/mac80211/debugfs_netdev.c
++++ b/net/mac80211/debugfs_netdev.c
+@@ -394,7 +394,7 @@ static ssize_t ieee80211_if_parse_uapsd_
+ __IEEE80211_IF_FILE_W(uapsd_max_sp_len);
+ 
+ /* AP attributes */
+-IEEE80211_IF_FILE(num_sta_authorized, u.ap.num_sta_authorized, ATOMIC);
++IEEE80211_IF_FILE(num_mcast_sta, u.ap.num_mcast_sta, ATOMIC);
+ IEEE80211_IF_FILE(num_sta_ps, u.ap.num_sta_ps, ATOMIC);
+ IEEE80211_IF_FILE(dtim_count, u.ap.dtim_count, DEC);
+ 
+@@ -540,7 +540,7 @@ static void add_sta_files(struct ieee802
+ 
+ static void add_ap_files(struct ieee80211_sub_if_data *sdata)
+ {
+-      DEBUGFS_ADD(num_sta_authorized);
++      DEBUGFS_ADD(num_mcast_sta);
+       DEBUGFS_ADD(num_sta_ps);
+       DEBUGFS_ADD(dtim_count);
+       DEBUGFS_ADD(num_buffered_multicast);
+--- a/net/mac80211/ieee80211_i.h
++++ b/net/mac80211/ieee80211_i.h
+@@ -282,7 +282,7 @@ struct ieee80211_if_ap {
+       u8 tim[sizeof(unsigned long) * BITS_TO_LONGS(IEEE80211_MAX_AID + 1)];
+       struct sk_buff_head ps_bc_buf;
+       atomic_t num_sta_ps; /* number of stations in PS mode */
+-      atomic_t num_sta_authorized; /* number of authorized stations */
++      atomic_t num_mcast_sta; /* number of stations receiving multicast */
+       int dtim_count;
+       bool dtim_bc_mc;
+ };
+--- a/net/mac80211/sta_info.c
++++ b/net/mac80211/sta_info.c
+@@ -1418,14 +1418,14 @@ int sta_info_move_state(struct sta_info 
+                       set_bit(WLAN_STA_ASSOC, &sta->_flags);
+               } else if (sta->sta_state == IEEE80211_STA_AUTHORIZED) {
+                       if (sta->sdata->vif.type == NL80211_IFTYPE_AP)
+-                              atomic_dec(&sta->sdata->u.ap.num_sta_authorized);
++                              atomic_dec(&sta->sdata->u.ap.num_mcast_sta);
+                       clear_bit(WLAN_STA_AUTHORIZED, &sta->_flags);
+               }
+               break;
+       case IEEE80211_STA_AUTHORIZED:
+               if (sta->sta_state == IEEE80211_STA_ASSOC) {
+                       if (sta->sdata->vif.type == NL80211_IFTYPE_AP)
+-                              atomic_inc(&sta->sdata->u.ap.num_sta_authorized);
++                              atomic_inc(&sta->sdata->u.ap.num_mcast_sta);
+                       set_bit(WLAN_STA_AUTHORIZED, &sta->_flags);
+               }
+               break;
+--- a/net/mac80211/tx.c
++++ b/net/mac80211/tx.c
+@@ -306,7 +306,7 @@ ieee80211_tx_h_check_assoc(struct ieee80
+               }
+       } 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))) {
++                          !atomic_read(&tx->sdata->u.ap.num_mcast_sta))) {
+               /*
+                * No associated STAs - no need to send multicast
+                * frames.

diff --git a/package/mac80211/patches/520-mac80211_cur_txpower.patch b/package/mac80211/patches/520-mac80211_cur_txpower.patch
index f6dbbef..66dadf8 100644 (file)
--- a/package/mac80211/patches/520-mac80211_cur_txpower.patch
+++ b/package/mac80211/patches/520-mac80211_cur_txpower.patch
@@ -11,7 +11,7 @@
        u16 listen_interval;
 --- a/net/mac80211/cfg.c
 +++ b/net/mac80211/cfg.c
-@@ -1738,7 +1738,7 @@ static int ieee80211_get_tx_power(struct
+@@ -1742,7 +1742,7 @@ static int ieee80211_get_tx_power(struct
  {
        struct ieee80211_local *local = wiphy_priv(wiphy);
  

diff --git a/package/mac80211/patches/550-mac80211_optimize_mcs_rate_mask.patch b/package/mac80211/patches/550-mac80211_optimize_mcs_rate_mask.patch
index 2129d38..972262a 100644 (file)
--- a/package/mac80211/patches/550-mac80211_optimize_mcs_rate_mask.patch
+++ b/package/mac80211/patches/550-mac80211_optimize_mcs_rate_mask.patch
@@ -11,7 +11,7 @@
        union {
 --- a/net/mac80211/cfg.c
 +++ b/net/mac80211/cfg.c
-@@ -1914,9 +1914,20 @@ static int ieee80211_set_bitrate_mask(st
+@@ -1918,9 +1918,20 @@ static int ieee80211_set_bitrate_mask(st
        }
  
        for (i = 0; i < IEEE80211_NUM_BANDS; i++) {