Commit a4f606ea authored by Chun-Yeow Yeoh's avatar Chun-Yeow Yeoh Committed by Johannes Berg
Browse files

{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: default avatarChun-Yeow Yeoh <yeohchunyeow@gmail.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 3ddd53f3

include/linux/nl80211.h

+51 −47
Original line number Diff line number Diff line
@@ -2122,15 +2122,16 @@ enum nl80211_mntr_flags { 
 *	until giving up on a path discovery (in milliseconds)

 *

 * @NL80211_MESHCONF_HWMP_ACTIVE_PATH_TIMEOUT: The time (in TUs) for which mesh

 * points receiving a PREQ shall consider the forwarding information from the

 * root to be valid. (TU = time unit)

 *	points receiving a PREQ shall consider the forwarding information from

 *	the root to be valid. (TU = time unit)

 *

 * @NL80211_MESHCONF_HWMP_PREQ_MIN_INTERVAL: The minimum interval of time (in

 *	TUs) during which an MP can send only one action frame containing a PREQ

 *	reference element

 *

 * @NL80211_MESHCONF_HWMP_NET_DIAM_TRVS_TIME: The interval of time (in TUs)

 * that it takes for an HWMP information element to propagate across the mesh

 *	that it takes for an HWMP information element to propagate across the

 *	mesh

 *

 * @NL80211_MESHCONF_HWMP_ROOTMODE: whether root mode is enabled or not

 *
@@ -2155,13 +2156,14 @@ enum nl80211_mntr_flags { 
 *	threshold for average signal strength of candidate station to establish

 *	a peer link.

 *

 * @NL80211_MESHCONF_ATTR_MAX: highest possible mesh configuration attribute

 *

 * @NL80211_MESHCONF_SYNC_OFFSET_MAX_NEIGHBOR: maximum number of neighbors

 * to synchronize to for 11s default synchronization method (see 11C.12.2.2)

 *	to synchronize to for 11s default synchronization method

 *	(see 11C.12.2.2)

 *

 * @NL80211_MESHCONF_HT_OPMODE: set mesh HT protection mode.

 *

 * @NL80211_MESHCONF_ATTR_MAX: highest possible mesh configuration attribute

 *

 * @__NL80211_MESHCONF_ATTR_AFTER_LAST: internal use

 */

enum nl80211_meshconf_params {
@@ -2203,35 +2205,37 @@ enum nl80211_meshconf_params { 
 * @__NL80211_MESH_SETUP_INVALID: Internal use

 *

 * @NL80211_MESH_SETUP_ENABLE_VENDOR_PATH_SEL: Enable this option to use a

 * vendor specific path selection algorithm or disable it to use the default

 * HWMP.

 *	vendor specific path selection algorithm or disable it to use the

 *	default HWMP.

 *

 * @NL80211_MESH_SETUP_ENABLE_VENDOR_METRIC: Enable this option to use a

 *	vendor specific path metric or disable it to use the default Airtime

 *	metric.

 *

 * @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.

 *	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_USERSPACE_AUTH: Enable this option if an authentication

 *	daemon will be authenticating mesh candidates.

 *

 * @NL80211_MESH_SETUP_USERSPACE_AMPE: Enable this option if an authentication

 * daemon will be securing peer link frames.  AMPE is a secured version of Mesh

 * Peering Management (MPM) and is implemented with the assistance of a

 * userspace daemon.  When this flag is set, the kernel will send peer

 *	daemon will be securing peer link frames.  AMPE is a secured version of

 *	Mesh Peering Management (MPM) and is implemented with the assistance of

 *	a userspace daemon.  When this flag is set, the kernel will send peer

 *	management frames to a userspace daemon that will implement AMPE

 * functionality (security capabilities selection, key confirmation, and key

 * management).  When the flag is unset (default), the kernel can autonomously

 * complete (unsecured) mesh peering without the need of a userspace daemon.

 *

 * @NL80211_MESH_SETUP_ATTR_MAX: highest possible mesh setup attribute number

 *	functionality (security capabilities selection, key confirmation, and

 *	key management).  When the flag is unset (default), the kernel can

 *	autonomously complete (unsecured) mesh peering without the need of a

 *	userspace daemon.

 *

 * @NL80211_MESH_SETUP_ENABLE_VENDOR_SYNC: Enable this option to use a

 *	vendor specific synchronization method or disable it to use the default

 *	neighbor offset synchronization

 *

 * @NL80211_MESH_SETUP_ATTR_MAX: highest possible mesh setup attribute number

 *

 * @__NL80211_MESH_SETUP_ATTR_AFTER_LAST: Internal use

 */

enum nl80211_mesh_setup_params {

net/mac80211/cfg.c

+1 −2
Original line number Diff line number Diff line
@@ -1571,10 +1571,9 @@ static int ieee80211_update_mesh_config(struct wiphy *wiphy, 
		conf->dot11MeshGateAnnouncementProtocol =

			nconf->dot11MeshGateAnnouncementProtocol;

	}

	if (_chg_mesh_attr(NL80211_MESHCONF_HWMP_RANN_INTERVAL, mask)) {

	if (_chg_mesh_attr(NL80211_MESHCONF_HWMP_RANN_INTERVAL, mask))

		conf->dot11MeshHWMPRannInterval =

			nconf->dot11MeshHWMPRannInterval;

	}

	if (_chg_mesh_attr(NL80211_MESHCONF_FORWARDING, mask))

		conf->dot11MeshForwarding = nconf->dot11MeshForwarding;

	if (_chg_mesh_attr(NL80211_MESHCONF_RSSI_THRESHOLD, mask)) {

net/wireless/nl80211.c

+52 −45
Original line number Diff line number Diff line
@@ -3492,7 +3492,6 @@ static const struct nla_policy nl80211_meshconf_params_policy[NL80211_MESHCONF_A 
	[NL80211_MESHCONF_ELEMENT_TTL] = { .type = NLA_U8 },

	[NL80211_MESHCONF_AUTO_OPEN_PLINKS] = { .type = NLA_U8 },

	[NL80211_MESHCONF_SYNC_OFFSET_MAX_NEIGHBOR] = { .type = NLA_U32 },



	[NL80211_MESHCONF_HWMP_MAX_PREQ_RETRIES] = { .type = NLA_U8 },

	[NL80211_MESHCONF_PATH_REFRESH_TIME] = { .type = NLA_U32 },

	[NL80211_MESHCONF_MIN_DISCOVERY_TIMEOUT] = { .type = NLA_U16 },
@@ -3548,34 +3547,42 @@ do {\ 


	/* Fill in the params struct */

	FILL_IN_MESH_PARAM_IF_SET(tb, cfg, dot11MeshRetryTimeout,

			mask, NL80211_MESHCONF_RETRY_TIMEOUT, nla_get_u16);

				  mask, NL80211_MESHCONF_RETRY_TIMEOUT,

				  nla_get_u16);

	FILL_IN_MESH_PARAM_IF_SET(tb, cfg, dot11MeshConfirmTimeout,

			mask, NL80211_MESHCONF_CONFIRM_TIMEOUT, nla_get_u16);

				  mask, NL80211_MESHCONF_CONFIRM_TIMEOUT,

				  nla_get_u16);

	FILL_IN_MESH_PARAM_IF_SET(tb, cfg, dot11MeshHoldingTimeout,

			mask, NL80211_MESHCONF_HOLDING_TIMEOUT, nla_get_u16);

				  mask, NL80211_MESHCONF_HOLDING_TIMEOUT,

				  nla_get_u16);

	FILL_IN_MESH_PARAM_IF_SET(tb, cfg, dot11MeshMaxPeerLinks,

			mask, NL80211_MESHCONF_MAX_PEER_LINKS, nla_get_u16);

				  mask, NL80211_MESHCONF_MAX_PEER_LINKS,

				  nla_get_u16);

	FILL_IN_MESH_PARAM_IF_SET(tb, cfg, dot11MeshMaxRetries,

			mask, NL80211_MESHCONF_MAX_RETRIES, nla_get_u8);

				  mask, NL80211_MESHCONF_MAX_RETRIES,

				  nla_get_u8);

	FILL_IN_MESH_PARAM_IF_SET(tb, cfg, dot11MeshTTL,

				  mask, NL80211_MESHCONF_TTL, nla_get_u8);

	FILL_IN_MESH_PARAM_IF_SET(tb, cfg, element_ttl,

			mask, NL80211_MESHCONF_ELEMENT_TTL, nla_get_u8);

				  mask, NL80211_MESHCONF_ELEMENT_TTL,

				  nla_get_u8);

	FILL_IN_MESH_PARAM_IF_SET(tb, cfg, auto_open_plinks,

			mask, NL80211_MESHCONF_AUTO_OPEN_PLINKS, nla_get_u8);

	FILL_IN_MESH_PARAM_IF_SET(tb, cfg, dot11MeshNbrOffsetMaxNeighbor,

			mask, NL80211_MESHCONF_SYNC_OFFSET_MAX_NEIGHBOR,

				  mask, NL80211_MESHCONF_AUTO_OPEN_PLINKS,

				  nla_get_u8);

	FILL_IN_MESH_PARAM_IF_SET(tb, cfg, dot11MeshNbrOffsetMaxNeighbor, mask,

				  NL80211_MESHCONF_SYNC_OFFSET_MAX_NEIGHBOR,

				  nla_get_u32);

	FILL_IN_MESH_PARAM_IF_SET(tb, cfg, dot11MeshHWMPmaxPREQretries,

				  mask, NL80211_MESHCONF_HWMP_MAX_PREQ_RETRIES,

				  nla_get_u8);

	FILL_IN_MESH_PARAM_IF_SET(tb, cfg, path_refresh_time,

			mask, NL80211_MESHCONF_PATH_REFRESH_TIME, nla_get_u32);

				  mask, NL80211_MESHCONF_PATH_REFRESH_TIME,

				  nla_get_u32);

	FILL_IN_MESH_PARAM_IF_SET(tb, cfg, min_discovery_timeout,

				  mask, NL80211_MESHCONF_MIN_DISCOVERY_TIMEOUT,

				  nla_get_u16);

	FILL_IN_MESH_PARAM_IF_SET(tb, cfg, dot11MeshHWMPactivePathTimeout,

			mask, NL80211_MESHCONF_HWMP_ACTIVE_PATH_TIMEOUT,

	FILL_IN_MESH_PARAM_IF_SET(tb, cfg, dot11MeshHWMPactivePathTimeout, mask,

				  NL80211_MESHCONF_HWMP_ACTIVE_PATH_TIMEOUT,

				  nla_get_u32);

	FILL_IN_MESH_PARAM_IF_SET(tb, cfg, dot11MeshHWMPpreqMinInterval,

				  mask, NL80211_MESHCONF_HWMP_PREQ_MIN_INTERVAL,
@@ -3584,15 +3591,12 @@ do {\ 
				  mask, NL80211_MESHCONF_HWMP_PERR_MIN_INTERVAL,

				  nla_get_u16);

	FILL_IN_MESH_PARAM_IF_SET(tb, cfg,

			dot11MeshHWMPnetDiameterTraversalTime,

			mask, NL80211_MESHCONF_HWMP_NET_DIAM_TRVS_TIME,

				  dot11MeshHWMPnetDiameterTraversalTime, mask,

				  NL80211_MESHCONF_HWMP_NET_DIAM_TRVS_TIME,

				  nla_get_u16);

	FILL_IN_MESH_PARAM_IF_SET(tb, cfg,

			dot11MeshHWMPRootMode, mask,

			NL80211_MESHCONF_HWMP_ROOTMODE,

			nla_get_u8);

	FILL_IN_MESH_PARAM_IF_SET(tb, cfg,

			dot11MeshHWMPRannInterval, mask,

	FILL_IN_MESH_PARAM_IF_SET(tb, cfg, dot11MeshHWMPRootMode, mask,

				  NL80211_MESHCONF_HWMP_ROOTMODE, nla_get_u8);

	FILL_IN_MESH_PARAM_IF_SET(tb, cfg, dot11MeshHWMPRannInterval, mask,

				  NL80211_MESHCONF_HWMP_RANN_INTERVAL,

				  nla_get_u16);

	FILL_IN_MESH_PARAM_IF_SET(tb, cfg,
@@ -3600,11 +3604,14 @@ do {\ 
				  NL80211_MESHCONF_GATE_ANNOUNCEMENTS,

				  nla_get_u8);

	FILL_IN_MESH_PARAM_IF_SET(tb, cfg, dot11MeshForwarding,

			mask, NL80211_MESHCONF_FORWARDING, nla_get_u8);

				  mask, NL80211_MESHCONF_FORWARDING,

				  nla_get_u8);

	FILL_IN_MESH_PARAM_IF_SET(tb, cfg, rssi_threshold,

			mask, NL80211_MESHCONF_RSSI_THRESHOLD, nla_get_u32);

				  mask, NL80211_MESHCONF_RSSI_THRESHOLD,

				  nla_get_u32);

	FILL_IN_MESH_PARAM_IF_SET(tb, cfg, ht_opmode,

			mask, NL80211_MESHCONF_HT_OPMODE, nla_get_u16);

				  mask, NL80211_MESHCONF_HT_OPMODE,

				  nla_get_u16);

	if (mask_out)

		*mask_out = mask;

include/net/cfg80211.h

+6 −6

File changed.

Contains only whitespace changes.

net/mac80211/debugfs_netdev.c

+17 −17

File changed.

Contains only whitespace changes.

include/linux/ieee80211.h

+3 −3

File changed.

Contains only whitespace changes.