dlan17/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nl80211: rename NL80211_MESH_SETUP_VENDOR_PATH_SEL_IE

Browse Source 
To NL80211_MESH_SETUP_IE. This reflects our ability to insert any ie
into a mesh beacon, not simply path selection ies.

Signed-off-by: Javier Cardona <javier@cozybit.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Javier Cardona
2011-04-12 16:57:37 -04:00
committed by John W. Linville
parent a22e93f5d8
commit 581a8b0fee
9 changed files with 31 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/linux/nl80211.h
+5 -4
View File
@@ -545,6 +545,7 @@ enum nl80211_commands {
/* source-level API compatibility */
#define NL80211_CMD_GET_MESH_PARAMS NL80211_CMD_GET_MESH_CONFIG
#define NL80211_CMD_SET_MESH_PARAMS NL80211_CMD_SET_MESH_CONFIG
#define NL80211_MESH_SETUP_VENDOR_PATH_SEL_IE NL80211_MESH_SETUP_IE
/**
* enum nl80211_attrs - nl80211 netlink attributes
@@ -1719,9 +1720,9 @@ enum nl80211_meshconf_params {
* vendor specific path metric or disable it to use the default Airtime
* metric.
*
* @NL80211_MESH_SETUP_VENDOR_PATH_SEL_IE: A vendor specific information
* element that vendors will use to identify the path selection methods and
* metrics in use.
* @NL80211_MESH_SETUP_IE: Information elements for this mesh, for instance, a
* robust security network ie, or a vendor specific information element that
* vendors will use to identify the path selection methods and metrics in use.
*
* @NL80211_MESH_SETUP_ATTR_MAX: highest possible mesh setup attribute number
* @__NL80211_MESH_SETUP_ATTR_AFTER_LAST: Internal use
@@ -1730,7 +1731,7 @@ enum nl80211_mesh_setup_params {
__NL80211_MESH_SETUP_INVALID,
NL80211_MESH_SETUP_ENABLE_VENDOR_PATH_SEL,
NL80211_MESH_SETUP_ENABLE_VENDOR_METRIC,
NL80211_MESH_SETUP_VENDOR_PATH_SEL_IE,
NL80211_MESH_SETUP_IE,
/* keep last */
__NL80211_MESH_SETUP_ATTR_AFTER_LAST,
include/net/cfg80211.h
+4 -4
View File
@@ -689,8 +689,8 @@ struct mesh_config {
* @mesh_id_len: length of the mesh ID, at least 1 and at most 32 bytes
* @path_sel_proto: which path selection protocol to use
* @path_metric: which metric to use
* @vendor_ie: vendor information elements (optional)
* @vendor_ie_len: length of vendor information elements
* @ie: vendor information elements (optional)
* @ie_len: length of vendor information elements
*
* These parameters are fixed when the mesh is created.
*/
@@ -699,8 +699,8 @@ struct mesh_setup {
u8 mesh_id_len;
u8 path_sel_proto;
u8 path_metric;
const u8 *vendor_ie;
u8 vendor_ie_len;
const u8 *ie;
u8 ie_len;
};
/**