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

Commit 7e3ed02c authored by Felix Fietkau's avatar Felix Fietkau Committed by John W. Linville
Browse files

mac80211: fix num_mcast_sta counting issues 



Moving a STA to an AP VLAN prevents num_mcast_sta from being decremented
once the STA leaves, because sta->sdata changes. Fix this by checking
for AP VLANs as well.

Also exclude 4-addr VLAN stations from num_mcast_sta - remote 4-addr
stations ignore 3-address multicast frames anyway. In a typical bridge
configuration they receive the same packets as 4-address unicast.

This patch also fixes clearing the sdata->u.vlan.sta pointer when the
STA is removed from a 4-addr VLAN.

Signed-off-by: default avatarFelix Fietkau <nbd@openwrt.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 030ef8f8

net/mac80211/cfg.c

+19 −0
Original line number Diff line number Diff line
@@ -1005,6 +1005,9 @@ static int ieee80211_change_station(struct wiphy *wiphy, 
	}



	if (params->vlan && params->vlan != sta->sdata->dev) {

		bool prev_4addr = false;

		bool new_4addr = false;



		vlansdata = IEEE80211_DEV_TO_SUB_IF(params->vlan);



		if (vlansdata->vif.type != NL80211_IFTYPE_AP_VLAN &&
@@ -1020,9 +1023,25 @@ static int ieee80211_change_station(struct wiphy *wiphy, 
			}



			rcu_assign_pointer(vlansdata->u.vlan.sta, sta);

			new_4addr = true;

		}



		if (sta->sdata->vif.type == NL80211_IFTYPE_AP_VLAN &&

		    sta->sdata->u.vlan.sta) {

			rcu_assign_pointer(sta->sdata->u.vlan.sta, NULL);

			prev_4addr = true;

		}



		sta->sdata = vlansdata;



		if (sta->sta_state == IEEE80211_STA_AUTHORIZED &&

		    prev_4addr != new_4addr) {

			if (new_4addr)

				atomic_dec(&sta->sdata->bss->num_mcast_sta);

			else

				atomic_inc(&sta->sdata->bss->num_mcast_sta);

		}



		ieee80211_send_layer2_update(sta);

	}

net/mac80211/sta_info.c

+8 −4
Original line number Diff line number Diff line
@@ -1417,15 +1417,19 @@ int sta_info_move_state(struct sta_info *sta, 
		if (sta->sta_state == IEEE80211_STA_AUTH) {

			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_mcast_sta);

			if (sta->sdata->vif.type == NL80211_IFTYPE_AP ||

			    (sta->sdata->vif.type == NL80211_IFTYPE_AP_VLAN &&

			     !sta->sdata->u.vlan.sta))

				atomic_dec(&sta->sdata->bss->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_mcast_sta);

			if (sta->sdata->vif.type == NL80211_IFTYPE_AP ||

			    (sta->sdata->vif.type == NL80211_IFTYPE_AP_VLAN &&

			     !sta->sdata->u.vlan.sta))

				atomic_inc(&sta->sdata->bss->num_mcast_sta);

			set_bit(WLAN_STA_AUTHORIZED, &sta->_flags);

		}

		break;