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

Commit 97ad9139 authored by Javier Cardona's avatar Javier Cardona Committed by John W. Linville
Browse files

mac80211: Moved mesh action codes to a more visible location 



Grouped mesh action codes together with the other action codes in
ieee80211.h.

Signed-off-by: default avatarJavier Cardona <javier@cozybit.com>
Reviewed-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 60ece404

include/linux/ieee80211.h

+2 −0
Original line number Diff line number Diff line
@@ -1211,6 +1211,8 @@ enum ieee80211_category { 
	WLAN_CATEGORY_SA_QUERY = 8,

	WLAN_CATEGORY_PROTECTED_DUAL_OF_ACTION = 9,

	WLAN_CATEGORY_WMM = 17,

	WLAN_CATEGORY_MESH_PLINK = 30,		/* Pending ANA approval */

	WLAN_CATEGORY_MESH_PATH_SEL = 32,	/* Pending ANA approval */

	WLAN_CATEGORY_VENDOR_SPECIFIC_PROTECTED = 126,

	WLAN_CATEGORY_VENDOR_SPECIFIC = 127,

};

net/mac80211/mesh.c

+2 −2
Original line number Diff line number Diff line
@@ -600,10 +600,10 @@ static void ieee80211_mesh_rx_mgmt_action(struct ieee80211_sub_if_data *sdata, 
					  struct ieee80211_rx_status *rx_status)

{

	switch (mgmt->u.action.category) {

	case MESH_PLINK_CATEGORY:

	case WLAN_CATEGORY_MESH_PLINK:

		mesh_rx_plink_frame(sdata, mgmt, len, rx_status);

		break;

	case MESH_PATH_SEL_CATEGORY:

	case WLAN_CATEGORY_MESH_PATH_SEL:

		mesh_rx_path_sel_frame(sdata, mgmt, len);

		break;

	}

net/mac80211/mesh.h

+0 −2
Original line number Diff line number Diff line
@@ -209,8 +209,6 @@ struct mesh_rmc { 
#define MESH_MAX_MPATHS		1024



/* Pending ANA approval */

#define MESH_PLINK_CATEGORY	30

#define MESH_PATH_SEL_CATEGORY	32

#define MESH_PATH_SEL_ACTION	0



/* PERR reason codes */

net/mac80211/mesh_hwmp.c

+2 −2
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ static int mesh_path_sel_frame_tx(enum mpath_frame_type action, u8 flags, 
	memcpy(mgmt->sa, sdata->vif.addr, ETH_ALEN);

	/* BSSID == SA */

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

	mgmt->u.action.category = MESH_PATH_SEL_CATEGORY;

	mgmt->u.action.category = WLAN_CATEGORY_MESH_PATH_SEL;

	mgmt->u.action.u.mesh_action.action_code = MESH_PATH_SEL_ACTION;



	switch (action) {
@@ -224,7 +224,7 @@ int mesh_path_error_tx(u8 ttl, u8 *target, __le32 target_sn, 
	memcpy(mgmt->da, ra, ETH_ALEN);

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

	/* BSSID is left zeroed, wildcard value */

	mgmt->u.action.category = MESH_PATH_SEL_CATEGORY;

	mgmt->u.action.category = WLAN_CATEGORY_MESH_PATH_SEL;

	mgmt->u.action.u.mesh_action.action_code = MESH_PATH_SEL_ACTION;

	ie_len = 15;

	pos = skb_put(skb, 2 + ie_len);

net/mac80211/mesh_plink.c

+1 −1
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ static int mesh_plink_frame_tx(struct ieee80211_sub_if_data *sdata, 
	memcpy(mgmt->da, da, ETH_ALEN);

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

	/* BSSID is left zeroed, wildcard value */

	mgmt->u.action.category = MESH_PLINK_CATEGORY;

	mgmt->u.action.category = WLAN_CATEGORY_MESH_PLINK;

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



	if (action == PLINK_CLOSE)