aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/nl80211.h
diff options
context:
space:
mode:
authorChun-Yeow Yeoh <yeohchunyeow@gmail.com>2012-06-10 23:59:36 -0400
committerJohannes Berg <johannes.berg@intel.com>2012-06-11 03:23:45 -0400
commita4f606ea73d56d15f28653d2242e54d58bb612e5 (patch)
treef885d00931cb33a5da5f4ac391bc6d8e521e456f /include/linux/nl80211.h
parent3ddd53f392c4f8e19e1110d1bdef770008b128b8 (diff)
{nl,cfg,mac}80211: fix the coding style related to mesh parameters
fix the coding style related to mesh parameters, especially the indentation, as pointed out by Johannes Berg. Signed-off-by: Chun-Yeow Yeoh <yeohchunyeow@gmail.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'include/linux/nl80211.h')
-rw-r--r--include/linux/nl80211.h98
1 files changed, 51 insertions, 47 deletions
diff --git a/include/linux/nl80211.h b/include/linux/nl80211.h
index 970afdf5a605..c61e1621822c 100644
--- a/include/linux/nl80211.h
+++ b/include/linux/nl80211.h
@@ -2090,78 +2090,80 @@ enum nl80211_mntr_flags {
2090 * @__NL80211_MESHCONF_INVALID: internal use 2090 * @__NL80211_MESHCONF_INVALID: internal use
2091 * 2091 *
2092 * @NL80211_MESHCONF_RETRY_TIMEOUT: specifies the initial retry timeout in 2092 * @NL80211_MESHCONF_RETRY_TIMEOUT: specifies the initial retry timeout in
2093 * millisecond units, used by the Peer Link Open message 2093 * millisecond units, used by the Peer Link Open message
2094 * 2094 *
2095 * @NL80211_MESHCONF_CONFIRM_TIMEOUT: specifies the initial confirm timeout, in 2095 * @NL80211_MESHCONF_CONFIRM_TIMEOUT: specifies the initial confirm timeout, in
2096 * millisecond units, used by the peer link management to close a peer link 2096 * millisecond units, used by the peer link management to close a peer link
2097 * 2097 *
2098 * @NL80211_MESHCONF_HOLDING_TIMEOUT: specifies the holding timeout, in 2098 * @NL80211_MESHCONF_HOLDING_TIMEOUT: specifies the holding timeout, in
2099 * millisecond units 2099 * millisecond units
2100 * 2100 *
2101 * @NL80211_MESHCONF_MAX_PEER_LINKS: maximum number of peer links allowed 2101 * @NL80211_MESHCONF_MAX_PEER_LINKS: maximum number of peer links allowed
2102 * on this mesh interface 2102 * on this mesh interface
2103 * 2103 *
2104 * @NL80211_MESHCONF_MAX_RETRIES: specifies the maximum number of peer link 2104 * @NL80211_MESHCONF_MAX_RETRIES: specifies the maximum number of peer link
2105 * open retries that can be sent to establish a new peer link instance in a 2105 * open retries that can be sent to establish a new peer link instance in a
2106 * mesh 2106 * mesh
2107 * 2107 *
2108 * @NL80211_MESHCONF_TTL: specifies the value of TTL field set at a source mesh 2108 * @NL80211_MESHCONF_TTL: specifies the value of TTL field set at a source mesh
2109 * point. 2109 * point.
2110 * 2110 *
2111 * @NL80211_MESHCONF_AUTO_OPEN_PLINKS: whether we should automatically 2111 * @NL80211_MESHCONF_AUTO_OPEN_PLINKS: whether we should automatically
2112 * open peer links when we detect compatible mesh peers. 2112 * open peer links when we detect compatible mesh peers.
2113 * 2113 *
2114 * @NL80211_MESHCONF_HWMP_MAX_PREQ_RETRIES: the number of action frames 2114 * @NL80211_MESHCONF_HWMP_MAX_PREQ_RETRIES: the number of action frames
2115 * containing a PREQ that an MP can send to a particular destination (path 2115 * containing a PREQ that an MP can send to a particular destination (path
2116 * target) 2116 * target)
2117 * 2117 *
2118 * @NL80211_MESHCONF_PATH_REFRESH_TIME: how frequently to refresh mesh paths 2118 * @NL80211_MESHCONF_PATH_REFRESH_TIME: how frequently to refresh mesh paths
2119 * (in milliseconds) 2119 * (in milliseconds)
2120 * 2120 *
2121 * @NL80211_MESHCONF_MIN_DISCOVERY_TIMEOUT: minimum length of time to wait 2121 * @NL80211_MESHCONF_MIN_DISCOVERY_TIMEOUT: minimum length of time to wait
2122 * until giving up on a path discovery (in milliseconds) 2122 * until giving up on a path discovery (in milliseconds)
2123 * 2123 *
2124 * @NL80211_MESHCONF_HWMP_ACTIVE_PATH_TIMEOUT: The time (in TUs) for which mesh 2124 * @NL80211_MESHCONF_HWMP_ACTIVE_PATH_TIMEOUT: The time (in TUs) for which mesh
2125 * points receiving a PREQ shall consider the forwarding information from the 2125 * points receiving a PREQ shall consider the forwarding information from
2126 * root to be valid. (TU = time unit) 2126 * the root to be valid. (TU = time unit)
2127 * 2127 *
2128 * @NL80211_MESHCONF_HWMP_PREQ_MIN_INTERVAL: The minimum interval of time (in 2128 * @NL80211_MESHCONF_HWMP_PREQ_MIN_INTERVAL: The minimum interval of time (in
2129 * TUs) during which an MP can send only one action frame containing a PREQ 2129 * TUs) during which an MP can send only one action frame containing a PREQ
2130 * reference element 2130 * reference element
2131 * 2131 *
2132 * @NL80211_MESHCONF_HWMP_NET_DIAM_TRVS_TIME: The interval of time (in TUs) 2132 * @NL80211_MESHCONF_HWMP_NET_DIAM_TRVS_TIME: The interval of time (in TUs)
2133 * that it takes for an HWMP information element to propagate across the mesh 2133 * that it takes for an HWMP information element to propagate across the
2134 * mesh
2134 * 2135 *
2135 * @NL80211_MESHCONF_HWMP_ROOTMODE: whether root mode is enabled or not 2136 * @NL80211_MESHCONF_HWMP_ROOTMODE: whether root mode is enabled or not
2136 * 2137 *
2137 * @NL80211_MESHCONF_ELEMENT_TTL: specifies the value of TTL field set at a 2138 * @NL80211_MESHCONF_ELEMENT_TTL: specifies the value of TTL field set at a
2138 * source mesh point for path selection elements. 2139 * source mesh point for path selection elements.
2139 * 2140 *
2140 * @NL80211_MESHCONF_HWMP_RANN_INTERVAL: The interval of time (in TUs) between 2141 * @NL80211_MESHCONF_HWMP_RANN_INTERVAL: The interval of time (in TUs) between
2141 * root announcements are transmitted. 2142 * root announcements are transmitted.
2142 * 2143 *
2143 * @NL80211_MESHCONF_GATE_ANNOUNCEMENTS: Advertise that this mesh station has 2144 * @NL80211_MESHCONF_GATE_ANNOUNCEMENTS: Advertise that this mesh station has
2144 * access to a broader network beyond the MBSS. This is done via Root 2145 * access to a broader network beyond the MBSS. This is done via Root
2145 * Announcement frames. 2146 * Announcement frames.
2146 * 2147 *
2147 * @NL80211_MESHCONF_HWMP_PERR_MIN_INTERVAL: The minimum interval of time (in 2148 * @NL80211_MESHCONF_HWMP_PERR_MIN_INTERVAL: The minimum interval of time (in
2148 * TUs) during which a mesh STA can send only one Action frame containing a 2149 * TUs) during which a mesh STA can send only one Action frame containing a
2149 * PERR element. 2150 * PERR element.
2150 * 2151 *
2151 * @NL80211_MESHCONF_FORWARDING: set Mesh STA as forwarding or non-forwarding 2152 * @NL80211_MESHCONF_FORWARDING: set Mesh STA as forwarding or non-forwarding
2152 * or forwarding entity (default is TRUE - forwarding entity) 2153 * or forwarding entity (default is TRUE - forwarding entity)
2153 * 2154 *
2154 * @NL80211_MESHCONF_RSSI_THRESHOLD: RSSI threshold in dBm. This specifies the 2155 * @NL80211_MESHCONF_RSSI_THRESHOLD: RSSI threshold in dBm. This specifies the
2155 * threshold for average signal strength of candidate station to establish 2156 * threshold for average signal strength of candidate station to establish
2156 * a peer link. 2157 * a peer link.
2157 *
2158 * @NL80211_MESHCONF_ATTR_MAX: highest possible mesh configuration attribute
2159 * 2158 *
2160 * @NL80211_MESHCONF_SYNC_OFFSET_MAX_NEIGHBOR: maximum number of neighbors 2159 * @NL80211_MESHCONF_SYNC_OFFSET_MAX_NEIGHBOR: maximum number of neighbors
2161 * to synchronize to for 11s default synchronization method (see 11C.12.2.2) 2160 * to synchronize to for 11s default synchronization method
2161 * (see 11C.12.2.2)
2162 * 2162 *
2163 * @NL80211_MESHCONF_HT_OPMODE: set mesh HT protection mode. 2163 * @NL80211_MESHCONF_HT_OPMODE: set mesh HT protection mode.
2164 * 2164 *
2165 * @NL80211_MESHCONF_ATTR_MAX: highest possible mesh configuration attribute
2166 *
2165 * @__NL80211_MESHCONF_ATTR_AFTER_LAST: internal use 2167 * @__NL80211_MESHCONF_ATTR_AFTER_LAST: internal use
2166 */ 2168 */
2167enum nl80211_meshconf_params { 2169enum nl80211_meshconf_params {
@@ -2203,34 +2205,36 @@ enum nl80211_meshconf_params {
2203 * @__NL80211_MESH_SETUP_INVALID: Internal use 2205 * @__NL80211_MESH_SETUP_INVALID: Internal use
2204 * 2206 *
2205 * @NL80211_MESH_SETUP_ENABLE_VENDOR_PATH_SEL: Enable this option to use a 2207 * @NL80211_MESH_SETUP_ENABLE_VENDOR_PATH_SEL: Enable this option to use a
2206 * vendor specific path selection algorithm or disable it to use the default 2208 * vendor specific path selection algorithm or disable it to use the
2207 * HWMP. 2209 * default HWMP.
2208 * 2210 *
2209 * @NL80211_MESH_SETUP_ENABLE_VENDOR_METRIC: Enable this option to use a 2211 * @NL80211_MESH_SETUP_ENABLE_VENDOR_METRIC: Enable this option to use a
2210 * vendor specific path metric or disable it to use the default Airtime 2212 * vendor specific path metric or disable it to use the default Airtime
2211 * metric. 2213 * metric.
2212 * 2214 *
2213 * @NL80211_MESH_SETUP_IE: Information elements for this mesh, for instance, a 2215 * @NL80211_MESH_SETUP_IE: Information elements for this mesh, for instance, a
2214 * robust security network ie, or a vendor specific information element that 2216 * robust security network ie, or a vendor specific information element
2215 * vendors will use to identify the path selection methods and metrics in use. 2217 * that vendors will use to identify the path selection methods and
2218 * metrics in use.
2216 * 2219 *
2217 * @NL80211_MESH_SETUP_USERSPACE_AUTH: Enable this option if an authentication 2220 * @NL80211_MESH_SETUP_USERSPACE_AUTH: Enable this option if an authentication
2218 * daemon will be authenticating mesh candidates. 2221 * daemon will be authenticating mesh candidates.
2219 * 2222 *
2220 * @NL80211_MESH_SETUP_USERSPACE_AMPE: Enable this option if an authentication 2223 * @NL80211_MESH_SETUP_USERSPACE_AMPE: Enable this option if an authentication
2221 * daemon will be securing peer link frames. AMPE is a secured version of Mesh 2224 * daemon will be securing peer link frames. AMPE is a secured version of
2222 * Peering Management (MPM) and is implemented with the assistance of a 2225 * Mesh Peering Management (MPM) and is implemented with the assistance of
2223 * userspace daemon. When this flag is set, the kernel will send peer 2226 * a userspace daemon. When this flag is set, the kernel will send peer
2224 * management frames to a userspace daemon that will implement AMPE 2227 * management frames to a userspace daemon that will implement AMPE
2225 * functionality (security capabilities selection, key confirmation, and key 2228 * functionality (security capabilities selection, key confirmation, and
2226 * management). When the flag is unset (default), the kernel can autonomously 2229 * key management). When the flag is unset (default), the kernel can
2227 * complete (unsecured) mesh peering without the need of a userspace daemon. 2230 * autonomously complete (unsecured) mesh peering without the need of a
2228 * 2231 * userspace daemon.
2229 * @NL80211_MESH_SETUP_ATTR_MAX: highest possible mesh setup attribute number
2230 * 2232 *
2231 * @NL80211_MESH_SETUP_ENABLE_VENDOR_SYNC: Enable this option to use a 2233 * @NL80211_MESH_SETUP_ENABLE_VENDOR_SYNC: Enable this option to use a
2232 * vendor specific synchronization method or disable it to use the default 2234 * vendor specific synchronization method or disable it to use the default
2233 * neighbor offset synchronization 2235 * neighbor offset synchronization
2236 *
2237 * @NL80211_MESH_SETUP_ATTR_MAX: highest possible mesh setup attribute number
2234 * 2238 *
2235 * @__NL80211_MESH_SETUP_ATTR_AFTER_LAST: Internal use 2239 * @__NL80211_MESH_SETUP_ATTR_AFTER_LAST: Internal use
2236 */ 2240 */