Commit 68b9bea2 authored by Aloka Dixit's avatar Aloka Dixit Committed by Johannes Berg
Browse files

mac80211: support RNR for EMA AP 



Generate EMA beacons, each including MBSSID and RNR elements at a given
index. If number of stored RNR elements is more than the number of
MBSSID elements then add those in every EMA beacon.

Signed-off-by: default avatarAloka Dixit <quic_alokad@quicinc.com>
Link: https://lore.kernel.org/r/20230323113801.6903-3-quic_alokad@quicinc.com


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent dbbb27e1

net/mac80211/cfg.c

+58 −5
Original line number Diff line number Diff line
@@ -1084,6 +1084,23 @@ ieee80211_copy_mbssid_beacon(u8 *pos, struct cfg80211_mbssid_elems *dst, 
	return offset;

}



static int

ieee80211_copy_rnr_beacon(u8 *pos, struct cfg80211_rnr_elems *dst,

			  struct cfg80211_rnr_elems *src)

{

	int i, offset = 0;



	for (i = 0; i < src->cnt; i++) {

		memcpy(pos + offset, src->elem[i].data, src->elem[i].len);

		dst->elem[i].len = src->elem[i].len;

		dst->elem[i].data = pos + offset;

		offset += dst->elem[i].len;

	}

	dst->cnt = src->cnt;



	return offset;

}



static int ieee80211_assign_beacon(struct ieee80211_sub_if_data *sdata,

				   struct ieee80211_link_data *link,

				   struct cfg80211_beacon_data *params,
@@ -1091,6 +1108,7 @@ static int ieee80211_assign_beacon(struct ieee80211_sub_if_data *sdata, 
				   const struct ieee80211_color_change_settings *cca)

{

	struct cfg80211_mbssid_elems *mbssid = NULL;

	struct cfg80211_rnr_elems *rnr = NULL;

	struct beacon_data *new, *old;

	int new_head_len, new_tail_len;

	int size, err;
@@ -1122,11 +1140,21 @@ static int ieee80211_assign_beacon(struct ieee80211_sub_if_data *sdata, 
	if (params->mbssid_ies) {

		mbssid = params->mbssid_ies;

		size += struct_size(new->mbssid_ies, elem, mbssid->cnt);

		size += ieee80211_get_mbssid_beacon_len(mbssid, mbssid->cnt);

		if (params->rnr_ies) {

			rnr = params->rnr_ies;

			size += struct_size(new->rnr_ies, elem, rnr->cnt);

		}

		size += ieee80211_get_mbssid_beacon_len(mbssid, rnr,

							mbssid->cnt);

	} else if (old && old->mbssid_ies) {

		mbssid = old->mbssid_ies;

		size += struct_size(new->mbssid_ies, elem, mbssid->cnt);

		size += ieee80211_get_mbssid_beacon_len(mbssid, mbssid->cnt);

		if (old && old->rnr_ies) {

			rnr = old->rnr_ies;

			size += struct_size(new->rnr_ies, elem, rnr->cnt);

		}

		size += ieee80211_get_mbssid_beacon_len(mbssid, rnr,

							mbssid->cnt);

	}



	new = kzalloc(size, GFP_KERNEL);
@@ -1137,7 +1165,7 @@ static int ieee80211_assign_beacon(struct ieee80211_sub_if_data *sdata, 


	/*

	 * pointers go into the block we allocated,

	 * memory is | beacon_data | head | tail | mbssid_ies

	 * memory is | beacon_data | head | tail | mbssid_ies | rnr_ies

	 */

	new->head = ((u8 *) new) + sizeof(*new);

	new->tail = new->head + new_head_len;
@@ -1149,7 +1177,13 @@ static int ieee80211_assign_beacon(struct ieee80211_sub_if_data *sdata, 


		new->mbssid_ies = (void *)pos;

		pos += struct_size(new->mbssid_ies, elem, mbssid->cnt);

		ieee80211_copy_mbssid_beacon(pos, new->mbssid_ies, mbssid);

		pos += ieee80211_copy_mbssid_beacon(pos, new->mbssid_ies,

						    mbssid);

		if (rnr) {

			new->rnr_ies = (void *)pos;

			pos += struct_size(new->rnr_ies, elem, rnr->cnt);

			ieee80211_copy_rnr_beacon(pos, new->rnr_ies, rnr);

		}

		/* update bssid_indicator */

		link_conf->bssid_indicator =

			ilog2(__roundup_pow_of_two(mbssid->cnt + 1));
@@ -1507,6 +1541,7 @@ static void ieee80211_free_next_beacon(struct ieee80211_link_data *link) 
		return;



	kfree(link->u.ap.next_beacon->mbssid_ies);

	kfree(link->u.ap.next_beacon->rnr_ies);

	kfree(link->u.ap.next_beacon);

	link->u.ap.next_beacon = NULL;

}
@@ -3410,6 +3445,7 @@ cfg80211_beacon_dup(struct cfg80211_beacon_data *beacon) 


	if (beacon->mbssid_ies)

		len += ieee80211_get_mbssid_beacon_len(beacon->mbssid_ies,

						       beacon->rnr_ies,

						       beacon->mbssid_ies->cnt);



	new_beacon = kzalloc(sizeof(*new_beacon) + len, GFP_KERNEL);
@@ -3425,6 +3461,18 @@ cfg80211_beacon_dup(struct cfg80211_beacon_data *beacon) 
			kfree(new_beacon);

			return NULL;

		}



		if (beacon->rnr_ies && beacon->rnr_ies->cnt) {

			new_beacon->rnr_ies =

				kzalloc(struct_size(new_beacon->rnr_ies,

						    elem, beacon->rnr_ies->cnt),

					GFP_KERNEL);

			if (!new_beacon->rnr_ies) {

				kfree(new_beacon->mbssid_ies);

				kfree(new_beacon);

				return NULL;

			}

		}

	}



	pos = (u8 *)(new_beacon + 1);
@@ -3464,10 +3512,15 @@ cfg80211_beacon_dup(struct cfg80211_beacon_data *beacon) 
		memcpy(pos, beacon->probe_resp, beacon->probe_resp_len);

		pos += beacon->probe_resp_len;

	}

	if (beacon->mbssid_ies && beacon->mbssid_ies->cnt)

	if (beacon->mbssid_ies && beacon->mbssid_ies->cnt) {

		pos += ieee80211_copy_mbssid_beacon(pos,

						    new_beacon->mbssid_ies,

						    beacon->mbssid_ies);

		if (beacon->rnr_ies && beacon->rnr_ies->cnt)

			pos += ieee80211_copy_rnr_beacon(pos,

							 new_beacon->rnr_ies,

							 beacon->rnr_ies);

	}



	/* might copy -1, meaning no changes requested */

	new_beacon->ftm_responder = beacon->ftm_responder;

net/mac80211/ieee80211_i.h

+18 −3
Original line number Diff line number Diff line
@@ -270,6 +270,7 @@ struct beacon_data { 
	u16 cntdwn_counter_offsets[IEEE80211_MAX_CNTDWN_COUNTERS_NUM];

	u8 cntdwn_current_counter;

	struct cfg80211_mbssid_elems *mbssid_ies;

	struct cfg80211_rnr_elems *rnr_ies;

	struct rcu_head rcu_head;

};
@@ -1186,20 +1187,34 @@ ieee80211_vif_get_shift(struct ieee80211_vif *vif) 
}



static inline int

ieee80211_get_mbssid_beacon_len(struct cfg80211_mbssid_elems *elems, u8 i)

ieee80211_get_mbssid_beacon_len(struct cfg80211_mbssid_elems *elems,

				struct cfg80211_rnr_elems *rnr_elems,

				u8 i)

{

	int len = 0;



	if (!elems || !elems->cnt || i > elems->cnt)

		return 0;



	if (i < elems->cnt)

		return elems->elem[i].len;

	if (i < elems->cnt) {

		len = elems->elem[i].len;

		if (rnr_elems) {

			len += rnr_elems->elem[i].len;

			for (i = elems->cnt; i < rnr_elems->cnt; i++)

				len += rnr_elems->elem[i].len;

		}

		return len;

	}



	/* i == elems->cnt, calculate total length of all MBSSID elements */

	for (i = 0; i < elems->cnt; i++)

		len += elems->elem[i].len;



	if (rnr_elems) {

		for (i = 0; i < rnr_elems->cnt; i++)

			len += rnr_elems->elem[i].len;

	}



	return len;

}

net/mac80211/tx.c

+10 −0
Original line number Diff line number Diff line
@@ -5222,6 +5222,15 @@ ieee80211_beacon_add_mbssid(struct sk_buff *skb, struct beacon_data *beacon, 
	if (i < beacon->mbssid_ies->cnt) {

		skb_put_data(skb, beacon->mbssid_ies->elem[i].data,

			     beacon->mbssid_ies->elem[i].len);



		if (beacon->rnr_ies && beacon->rnr_ies->cnt) {

			skb_put_data(skb, beacon->rnr_ies->elem[i].data,

				     beacon->rnr_ies->elem[i].len);



			for (i = beacon->mbssid_ies->cnt; i < beacon->rnr_ies->cnt; i++)

				skb_put_data(skb, beacon->rnr_ies->elem[i].data,

					     beacon->rnr_ies->elem[i].len);

		}

		return;

	}
@@ -5259,6 +5268,7 @@ ieee80211_beacon_get_ap(struct ieee80211_hw *hw, 
	 * tail length, maximum TIM length and multiple BSSID length

	 */

	mbssid_len = ieee80211_get_mbssid_beacon_len(beacon->mbssid_ies,

						     beacon->rnr_ies,

						     ema_index);



	skb = dev_alloc_skb(local->tx_headroom + beacon->head_len +