diff options
author | Javier Cardona <javier@cozybit.com> | 2011-04-07 18:08:27 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-04-12 16:57:37 -0400 |
commit | 581a8b0feeed8877aab3a8ca4c972419790cd07f (patch) | |
tree | 36ef0e86b367e0abeb0a50fbf59840f125efdbc7 /include/linux/nl80211.h | |
parent | a22e93f5d819f11d2a2d6332e20ff5b462e5c208 (diff) |
nl80211: rename NL80211_MESH_SETUP_VENDOR_PATH_SEL_IE
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>
Diffstat (limited to 'include/linux/nl80211.h')
-rw-r--r-- | include/linux/nl80211.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/include/linux/nl80211.h b/include/linux/nl80211.h index 16eea7229e99..ecf6b68a96da 100644 --- a/include/linux/nl80211.h +++ b/include/linux/nl80211.h | |||
@@ -545,6 +545,7 @@ enum nl80211_commands { | |||
545 | /* source-level API compatibility */ | 545 | /* source-level API compatibility */ |
546 | #define NL80211_CMD_GET_MESH_PARAMS NL80211_CMD_GET_MESH_CONFIG | 546 | #define NL80211_CMD_GET_MESH_PARAMS NL80211_CMD_GET_MESH_CONFIG |
547 | #define NL80211_CMD_SET_MESH_PARAMS NL80211_CMD_SET_MESH_CONFIG | 547 | #define NL80211_CMD_SET_MESH_PARAMS NL80211_CMD_SET_MESH_CONFIG |
548 | #define NL80211_MESH_SETUP_VENDOR_PATH_SEL_IE NL80211_MESH_SETUP_IE | ||
548 | 549 | ||
549 | /** | 550 | /** |
550 | * enum nl80211_attrs - nl80211 netlink attributes | 551 | * enum nl80211_attrs - nl80211 netlink attributes |
@@ -1719,9 +1720,9 @@ enum nl80211_meshconf_params { | |||
1719 | * vendor specific path metric or disable it to use the default Airtime | 1720 | * vendor specific path metric or disable it to use the default Airtime |
1720 | * metric. | 1721 | * metric. |
1721 | * | 1722 | * |
1722 | * @NL80211_MESH_SETUP_VENDOR_PATH_SEL_IE: A vendor specific information | 1723 | * @NL80211_MESH_SETUP_IE: Information elements for this mesh, for instance, a |
1723 | * element that vendors will use to identify the path selection methods and | 1724 | * robust security network ie, or a vendor specific information element that |
1724 | * metrics in use. | 1725 | * vendors will use to identify the path selection methods and metrics in use. |
1725 | * | 1726 | * |
1726 | * @NL80211_MESH_SETUP_ATTR_MAX: highest possible mesh setup attribute number | 1727 | * @NL80211_MESH_SETUP_ATTR_MAX: highest possible mesh setup attribute number |
1727 | * @__NL80211_MESH_SETUP_ATTR_AFTER_LAST: Internal use | 1728 | * @__NL80211_MESH_SETUP_ATTR_AFTER_LAST: Internal use |
@@ -1730,7 +1731,7 @@ enum nl80211_mesh_setup_params { | |||
1730 | __NL80211_MESH_SETUP_INVALID, | 1731 | __NL80211_MESH_SETUP_INVALID, |
1731 | NL80211_MESH_SETUP_ENABLE_VENDOR_PATH_SEL, | 1732 | NL80211_MESH_SETUP_ENABLE_VENDOR_PATH_SEL, |
1732 | NL80211_MESH_SETUP_ENABLE_VENDOR_METRIC, | 1733 | NL80211_MESH_SETUP_ENABLE_VENDOR_METRIC, |
1733 | NL80211_MESH_SETUP_VENDOR_PATH_SEL_IE, | 1734 | NL80211_MESH_SETUP_IE, |
1734 | 1735 | ||
1735 | /* keep last */ | 1736 | /* keep last */ |
1736 | __NL80211_MESH_SETUP_ATTR_AFTER_LAST, | 1737 | __NL80211_MESH_SETUP_ATTR_AFTER_LAST, |