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

Commit 915b5c50 authored by Javier Cardona's avatar Javier Cardona Committed by John W. Linville
Browse files

open80211s: Stop using zero for address 3 in mesh plink mgmt frames 



Previous versions of 11s draft used the all zeroes address.  Current
draft uses the same address as address 2.

Also, use the ANA-approved action category code for peer establishment frames.

Note: This breaks compatibility with previous mesh protocol instances.

Signed-off-by: default avatarJavier Cardona <javier@cozybit.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent d3aaec8a

net/mac80211/mesh_plink.c

+2 −2
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ 
#define dot11MeshMaxPeerLinks(s) (s->u.mesh.mshcfg.dot11MeshMaxPeerLinks)



enum plink_frame_type {

	PLINK_OPEN = 0,

	PLINK_OPEN = 1,

	PLINK_CONFIRM,

	PLINK_CLOSE

};
@@ -181,7 +181,7 @@ static int mesh_plink_frame_tx(struct ieee80211_sub_if_data *sdata, 
					  IEEE80211_STYPE_ACTION);

	memcpy(mgmt->da, da, ETH_ALEN);

	memcpy(mgmt->sa, sdata->vif.addr, ETH_ALEN);

	/* BSSID is left zeroed, wildcard value */

	memcpy(mgmt->bssid, sdata->vif.addr, ETH_ALEN);

	mgmt->u.action.category = WLAN_CATEGORY_MESH_ACTION;

	mgmt->u.action.u.plink_action.action_code = action;