Commit 65821635 authored by Marco Porsch's avatar Marco Porsch Committed by Johannes Berg
Browse files

mac80211: move Mesh Capability field definition to ieee80211.h 



Signed-off-by: default avatarMarco Porsch <marco.porsch@etit.tu-chemnitz.de>
[prefix with IEEE80211_]
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 7bed2050

include/linux/ieee80211.h

+15 −0
Original line number Diff line number Diff line
@@ -667,6 +667,21 @@ struct ieee80211_meshconf_ie { 
	u8 meshconf_cap;

} __attribute__ ((packed));



/**

 * enum mesh_config_capab_flags - Mesh Configuration IE capability field flags

 *

 * @IEEE80211_MESHCONF_CAPAB_ACCEPT_PLINKS: STA is willing to establish

 *	additional mesh peerings with other mesh STAs

 * @IEEE80211_MESHCONF_CAPAB_FORWARDING: the STA forwards MSDUs

 * @IEEE80211_MESHCONF_CAPAB_TBTT_ADJUSTING: TBTT adjustment procedure

 *	is ongoing

 */

enum mesh_config_capab_flags {

	IEEE80211_MESHCONF_CAPAB_ACCEPT_PLINKS		= 0x01,

	IEEE80211_MESHCONF_CAPAB_FORWARDING		= 0x08,

	IEEE80211_MESHCONF_CAPAB_TBTT_ADJUSTING		= 0x20,

};



/**

 * struct ieee80211_rann_ie

 *

net/mac80211/mesh.c

+4 −4
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ bool mesh_matches_local(struct ieee80211_sub_if_data *sdata, 
bool mesh_peer_accepts_plinks(struct ieee802_11_elems *ie)

{

	return (ie->mesh_config->meshconf_cap &

	    MESHCONF_CAPAB_ACCEPT_PLINKS) != 0;

	    IEEE80211_MESHCONF_CAPAB_ACCEPT_PLINKS) != 0;

}



/**
@@ -269,11 +269,11 @@ mesh_add_meshconf_ie(struct sk_buff *skb, struct ieee80211_sub_if_data *sdata) 
	neighbors = (neighbors > 15) ? 15 : neighbors;

	*pos++ = neighbors << 1;

	/* Mesh capability */

	*pos = MESHCONF_CAPAB_FORWARDING;

	*pos = IEEE80211_MESHCONF_CAPAB_FORWARDING;

	*pos |= ifmsh->accepting_plinks ?

	    MESHCONF_CAPAB_ACCEPT_PLINKS : 0x00;

	    IEEE80211_MESHCONF_CAPAB_ACCEPT_PLINKS : 0x00;

	*pos++ |= ifmsh->adjusting_tbtt ?

	    MESHCONF_CAPAB_TBTT_ADJUSTING : 0x00;

	    IEEE80211_MESHCONF_CAPAB_TBTT_ADJUSTING : 0x00;

	*pos++ = 0x00;



	return 0;

net/mac80211/mesh.h

+0 −14
Original line number Diff line number Diff line
@@ -18,20 +18,6 @@ 


/* Data structures */



/**

 * enum mesh_config_capab_flags - mesh config IE capability flags

 *

 * @MESHCONF_CAPAB_ACCEPT_PLINKS: STA is willing to establish

 * additional mesh peerings with other mesh STAs

 * @MESHCONF_CAPAB_FORWARDING: the STA forwards MSDUs

 * @MESHCONF_CAPAB_TBTT_ADJUSTING: TBTT adjustment procedure is ongoing

 */

enum mesh_config_capab_flags {

	MESHCONF_CAPAB_ACCEPT_PLINKS = BIT(0),

	MESHCONF_CAPAB_FORWARDING = BIT(3),

	MESHCONF_CAPAB_TBTT_ADJUSTING = BIT(5),

};



/**

 * enum mesh_path_flags - mac80211 mesh path flags

 *

net/mac80211/mesh_sync.c

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ struct sync_method { 
static bool mesh_peer_tbtt_adjusting(struct ieee802_11_elems *ie)

{

	return (ie->mesh_config->meshconf_cap &

	    MESHCONF_CAPAB_TBTT_ADJUSTING) != 0;

	    IEEE80211_MESHCONF_CAPAB_TBTT_ADJUSTING) != 0;

}



void mesh_sync_adjust_tbtt(struct ieee80211_sub_if_data *sdata)