Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d19b3bf6 authored by Rui Paulo's avatar Rui Paulo Committed by John W. Linville
Browse files

mac80211: replace "destination" with "target" to follow the spec 



Resulting object files have the same MD5 as before.

Signed-off-by: default avatarRui Paulo <rpaulo@gmail.com>
Signed-off-by: default avatarJavier Cardona <javier@cozybit.com>
Reviewed-by: default avatarAndrey Yurovsky <andrey@cozybit.com>
Tested-by: default avatarBrian Cavagnolo <brian@cozybit.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent be125c60

include/linux/nl80211.h

+4 −4
Original line number Diff line number Diff line
@@ -899,14 +899,14 @@ enum nl80211_sta_info { 
 *

 * @NL80211_MPATH_FLAG_ACTIVE: the mesh path is active

 * @NL80211_MPATH_FLAG_RESOLVING: the mesh path discovery process is running

 * @NL80211_MPATH_FLAG_DSN_VALID: the mesh path contains a valid DSN

 * @NL80211_MPATH_FLAG_SN_VALID: the mesh path contains a valid SN

 * @NL80211_MPATH_FLAG_FIXED: the mesh path has been manually set

 * @NL80211_MPATH_FLAG_RESOLVED: the mesh path discovery process succeeded

 */

enum nl80211_mpath_flags {

	NL80211_MPATH_FLAG_ACTIVE =	1<<0,

	NL80211_MPATH_FLAG_RESOLVING =	1<<1,

	NL80211_MPATH_FLAG_DSN_VALID =	1<<2,

	NL80211_MPATH_FLAG_SN_VALID =	1<<2,

	NL80211_MPATH_FLAG_FIXED =	1<<3,

	NL80211_MPATH_FLAG_RESOLVED =	1<<4,

};
@@ -919,7 +919,7 @@ enum nl80211_mpath_flags { 
 *

 * @__NL80211_MPATH_INFO_INVALID: attribute number 0 is reserved

 * @NL80211_ATTR_MPATH_FRAME_QLEN: number of queued frames for this destination

 * @NL80211_ATTR_MPATH_DSN: destination sequence number

 * @NL80211_ATTR_MPATH_SN: destination sequence number

 * @NL80211_ATTR_MPATH_METRIC: metric (cost) of this mesh path

 * @NL80211_ATTR_MPATH_EXPTIME: expiration time for the path, in msec from now

 * @NL80211_ATTR_MPATH_FLAGS: mesh path flags, enumerated in
@@ -930,7 +930,7 @@ enum nl80211_mpath_flags { 
enum nl80211_mpath_info {

	__NL80211_MPATH_INFO_INVALID,

	NL80211_MPATH_INFO_FRAME_QLEN,

	NL80211_MPATH_INFO_DSN,

	NL80211_MPATH_INFO_SN,

	NL80211_MPATH_INFO_METRIC,

	NL80211_MPATH_INFO_EXPTIME,

	NL80211_MPATH_INFO_FLAGS,

include/net/cfg80211.h

+4 −4
Original line number Diff line number Diff line
@@ -420,7 +420,7 @@ enum monitor_flags { 
 * in during get_station() or dump_station().

 *

 * MPATH_INFO_FRAME_QLEN: @frame_qlen filled

 * MPATH_INFO_DSN: @dsn filled

 * MPATH_INFO_SN: @sn filled

 * MPATH_INFO_METRIC: @metric filled

 * MPATH_INFO_EXPTIME: @exptime filled

 * MPATH_INFO_DISCOVERY_TIMEOUT: @discovery_timeout filled
@@ -429,7 +429,7 @@ enum monitor_flags { 
 */

enum mpath_info_flags {

	MPATH_INFO_FRAME_QLEN		= BIT(0),

	MPATH_INFO_DSN			= BIT(1),

	MPATH_INFO_SN			= BIT(1),

	MPATH_INFO_METRIC		= BIT(2),

	MPATH_INFO_EXPTIME		= BIT(3),

	MPATH_INFO_DISCOVERY_TIMEOUT	= BIT(4),
@@ -444,7 +444,7 @@ enum mpath_info_flags { 
 *

 * @filled: bitfield of flags from &enum mpath_info_flags

 * @frame_qlen: number of queued frames for this destination

 * @dsn: destination sequence number

 * @sn: target sequence number

 * @metric: metric (cost) of this mesh path

 * @exptime: expiration time for the mesh path from now, in msecs

 * @flags: mesh path flags
@@ -458,7 +458,7 @@ enum mpath_info_flags { 
struct mpath_info {

	u32 filled;

	u32 frame_qlen;

	u32 dsn;

	u32 sn;

	u32 metric;

	u32 exptime;

	u32 discovery_timeout;

net/mac80211/cfg.c

+4 −4
Original line number Diff line number Diff line
@@ -935,7 +935,7 @@ static void mpath_set_pinfo(struct mesh_path *mpath, u8 *next_hop, 
	pinfo->generation = mesh_paths_generation;



	pinfo->filled = MPATH_INFO_FRAME_QLEN |

			MPATH_INFO_DSN |

			MPATH_INFO_SN |

			MPATH_INFO_METRIC |

			MPATH_INFO_EXPTIME |

			MPATH_INFO_DISCOVERY_TIMEOUT |
@@ -943,7 +943,7 @@ static void mpath_set_pinfo(struct mesh_path *mpath, u8 *next_hop, 
			MPATH_INFO_FLAGS;



	pinfo->frame_qlen = mpath->frame_queue.qlen;

	pinfo->dsn = mpath->dsn;

	pinfo->sn = mpath->sn;

	pinfo->metric = mpath->metric;

	if (time_before(jiffies, mpath->exp_time))

		pinfo->exptime = jiffies_to_msecs(mpath->exp_time - jiffies);
@@ -955,8 +955,8 @@ static void mpath_set_pinfo(struct mesh_path *mpath, u8 *next_hop, 
		pinfo->flags |= NL80211_MPATH_FLAG_ACTIVE;

	if (mpath->flags & MESH_PATH_RESOLVING)

		pinfo->flags |= NL80211_MPATH_FLAG_RESOLVING;

	if (mpath->flags & MESH_PATH_DSN_VALID)

		pinfo->flags |= NL80211_MPATH_FLAG_DSN_VALID;

	if (mpath->flags & MESH_PATH_SN_VALID)

		pinfo->flags |= NL80211_MPATH_FLAG_SN_VALID;

	if (mpath->flags & MESH_PATH_FIXED)

		pinfo->flags |= NL80211_MPATH_FLAG_FIXED;

	if (mpath->flags & MESH_PATH_RESOLVING)

net/mac80211/ieee80211_i.h

+5 −5
Original line number Diff line number Diff line
@@ -373,14 +373,14 @@ struct ieee80211_if_mesh { 
	u8 mesh_sp_id;

	/* Authentication Protocol Identifier */

	u8 mesh_auth_id;

	/* Local mesh Destination Sequence Number */

	u32 dsn;

	/* Local mesh Sequence Number */

	u32 sn;

	/* Last used PREQ ID */

	u32 preq_id;

	atomic_t mpaths;

	/* Timestamp of last DSN update */

	unsigned long last_dsn_update;

	/* Timestamp of last DSN sent */

	/* Timestamp of last SN update */

	unsigned long last_sn_update;

	/* Timestamp of last SN sent */

	unsigned long last_preq;

	struct mesh_rmc *rmc;

	spinlock_t mesh_preq_queue_lock;

net/mac80211/mesh.c

+1 −1
Original line number Diff line number Diff line
@@ -672,7 +672,7 @@ void ieee80211_mesh_init_sdata(struct ieee80211_sub_if_data *sdata) 
		MESH_MIN_DISCOVERY_TIMEOUT;

	ifmsh->accepting_plinks = true;

	ifmsh->preq_id = 0;

	ifmsh->dsn = 0;

	ifmsh->sn = 0;

	atomic_set(&ifmsh->mpaths, 0);

	mesh_rmc_init(sdata);

	ifmsh->last_preq = jiffies;