Commit 1239cd58 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

wireless: move mesh config length constant 



This is a constant from the 802.11 specification.

Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Cc: Javier Cardona <javier@cozybit.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 97c8b013

include/linux/ieee80211.h

+3 −0
Original line number Diff line number Diff line
@@ -97,7 +97,10 @@ 
#define IEEE80211_MAX_FRAME_LEN		2352



#define IEEE80211_MAX_SSID_LEN		32



#define IEEE80211_MAX_MESH_ID_LEN	32

#define IEEE80211_MESH_CONFIG_LEN	19



#define IEEE80211_QOS_CTL_LEN		2

#define IEEE80211_QOS_CTL_TID_MASK	0x000F

#define IEEE80211_QOS_CTL_TAG1D_MASK	0x0007

net/mac80211/mesh.c

+1 −1
Original line number Diff line number Diff line
@@ -238,7 +238,7 @@ void mesh_mgmt_ies_add(struct sk_buff *skb, struct ieee80211_sub_if_data *sdata) 


	pos = skb_put(skb, 21);

	*pos++ = WLAN_EID_MESH_CONFIG;

	*pos++ = MESH_CFG_LEN;

	*pos++ = IEEE80211_MESH_CONFIG_LEN;

	/* Version */

	*pos++ = 1;

net/mac80211/mesh.h

+1 −4
Original line number Diff line number Diff line
@@ -145,9 +145,6 @@ struct mesh_rmc { 
};





/* Mesh IEs constants */

#define MESH_CFG_LEN		19



/*

 * MESH_CFG_COMP_LEN Includes:

 * 	- Active path selection protocol ID.
@@ -157,7 +154,7 @@ struct mesh_rmc { 
 * Does not include mesh capabilities, which may vary across nodes in the same

 * mesh

 */

#define MESH_CFG_CMP_LEN 	17

#define MESH_CFG_CMP_LEN 	(IEEE80211_MESH_CONFIG_LEN - 2)



/* Default values, timeouts in ms */

#define MESH_TTL 		5

net/mac80211/scan.c

+1 −1
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ ieee80211_rx_mesh_bss_add(struct ieee80211_local *local, u8 *mesh_id, int mesh_i 
{

	struct ieee80211_bss *bss;



	if (mesh_config_len != MESH_CFG_LEN)

	if (mesh_config_len != IEEE80211_MESH_CONFIG_LEN)

		return NULL;



	bss = kzalloc(sizeof(*bss), GFP_ATOMIC);