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

Commit bf7cd94d authored by Johannes Berg's avatar Johannes Berg
Browse files

mac80211: clean up mesh code 



There's various code with strange indentation,
questionable loop and locking constructs, etc.

The bigger change is moving the "sdata" argument
to the first argument of all functions, like all
other mac80211 functions that have one.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 93c78c5d

net/mac80211/cfg.c

+7 −7
Original line number Diff line number Diff line
@@ -1500,13 +1500,13 @@ static int ieee80211_add_mpath(struct wiphy *wiphy, struct net_device *dev, 
		return -ENOENT;

	}



	err = mesh_path_add(dst, sdata);

	err = mesh_path_add(sdata, dst);

	if (err) {

		rcu_read_unlock();

		return err;

	}



	mpath = mesh_path_lookup(dst, sdata);

	mpath = mesh_path_lookup(sdata, dst);

	if (!mpath) {

		rcu_read_unlock();

		return -ENXIO;
@@ -1523,7 +1523,7 @@ static int ieee80211_del_mpath(struct wiphy *wiphy, struct net_device *dev, 
	struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);



	if (dst)

		return mesh_path_del(dst, sdata);

		return mesh_path_del(sdata, dst);



	mesh_path_flush_by_iface(sdata);

	return 0;
@@ -1547,7 +1547,7 @@ static int ieee80211_change_mpath(struct wiphy *wiphy, 
		return -ENOENT;

	}



	mpath = mesh_path_lookup(dst, sdata);

	mpath = mesh_path_lookup(sdata, dst);

	if (!mpath) {

		rcu_read_unlock();

		return -ENOENT;
@@ -1611,7 +1611,7 @@ static int ieee80211_get_mpath(struct wiphy *wiphy, struct net_device *dev, 
	sdata = IEEE80211_DEV_TO_SUB_IF(dev);



	rcu_read_lock();

	mpath = mesh_path_lookup(dst, sdata);

	mpath = mesh_path_lookup(sdata, dst);

	if (!mpath) {

		rcu_read_unlock();

		return -ENOENT;
@@ -1632,7 +1632,7 @@ static int ieee80211_dump_mpath(struct wiphy *wiphy, struct net_device *dev, 
	sdata = IEEE80211_DEV_TO_SUB_IF(dev);



	rcu_read_lock();

	mpath = mesh_path_lookup_by_idx(idx, sdata);

	mpath = mesh_path_lookup_by_idx(sdata, idx);

	if (!mpath) {

		rcu_read_unlock();

		return -ENOENT;

net/mac80211/main.c

+1 −2
Original line number Diff line number Diff line
@@ -1173,7 +1173,6 @@ static void __exit ieee80211_exit(void) 
	rc80211_minstrel_ht_exit();

	rc80211_minstrel_exit();



	if (mesh_allocated)

	ieee80211s_stop();



	ieee80211_iface_exit();

net/mac80211/mesh.c

+61 −54
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
#define TMR_RUNNING_MP	1

#define TMR_RUNNING_MPR	2



int mesh_allocated;

static int mesh_allocated;

static struct kmem_cache *rm_cache;



bool mesh_action_is_path_sel(struct ieee80211_mgmt *mgmt)
@@ -36,6 +36,8 @@ void ieee80211s_init(void) 


void ieee80211s_stop(void)

{

	if (!mesh_allocated)

		return;

	mesh_pathtbl_unregister();

	kmem_cache_destroy(rm_cache);

}
@@ -90,24 +92,22 @@ bool mesh_matches_local(struct ieee80211_sub_if_data *sdata, 
	     (ifmsh->mesh_cc_id == ie->mesh_config->meshconf_congest) &&

	     (ifmsh->mesh_sp_id == ie->mesh_config->meshconf_synch) &&

	     (ifmsh->mesh_auth_id == ie->mesh_config->meshconf_auth)))

		goto mismatch;

		return false;



	ieee80211_sta_get_rates(local, ie, ieee80211_get_sdata_band(sdata),

				&basic_rates);



	if (sdata->vif.bss_conf.basic_rates != basic_rates)

		goto mismatch;

		return false;



	ieee80211_ht_oper_to_chandef(sdata->vif.bss_conf.chandef.chan,

				     ie->ht_operation, &sta_chan_def);



	if (!cfg80211_chandef_compatible(&sdata->vif.bss_conf.chandef,

					 &sta_chan_def))

		goto mismatch;

		return false;



	return true;

mismatch:

	return false;

}



/**
@@ -196,11 +196,12 @@ void mesh_rmc_free(struct ieee80211_sub_if_data *sdata) 
	if (!sdata->u.mesh.rmc)

		return;



	for (i = 0; i < RMC_BUCKETS; i++)

	for (i = 0; i < RMC_BUCKETS; i++) {

		list_for_each_entry_safe(p, n, &rmc->bucket[i], list) {

			list_del(&p->list);

			kmem_cache_free(rm_cache, p);

		}

	}



	kfree(rmc);

	sdata->u.mesh.rmc = NULL;
@@ -209,6 +210,7 @@ void mesh_rmc_free(struct ieee80211_sub_if_data *sdata) 
/**

 * mesh_rmc_check - Check frame in recent multicast cache and add if absent.

 *

 * @sdata:	interface

 * @sa:		source address

 * @mesh_hdr:	mesh_header

 *
@@ -218,8 +220,8 @@ void mesh_rmc_free(struct ieee80211_sub_if_data *sdata) 
 * received this frame lately. If the frame is not in the cache, it is added to

 * it.

 */

int mesh_rmc_check(u8 *sa, struct ieee80211s_hdr *mesh_hdr,

		   struct ieee80211_sub_if_data *sdata)

int mesh_rmc_check(struct ieee80211_sub_if_data *sdata,

		   const u8 *sa, struct ieee80211s_hdr *mesh_hdr)

{

	struct mesh_rmc *rmc = sdata->u.mesh.rmc;

	u32 seqnum = 0;
@@ -233,12 +235,11 @@ int mesh_rmc_check(u8 *sa, struct ieee80211s_hdr *mesh_hdr, 
	list_for_each_entry_safe(p, n, &rmc->bucket[idx], list) {

		++entries;

		if (time_after(jiffies, p->exp_time) ||

				(entries == RMC_QUEUE_MAX_LEN)) {

		    entries == RMC_QUEUE_MAX_LEN) {

			list_del(&p->list);

			kmem_cache_free(rm_cache, p);

			--entries;

		} else if ((seqnum == p->seqnum) &&

			   (ether_addr_equal(sa, p->sa)))

		} else if ((seqnum == p->seqnum) && ether_addr_equal(sa, p->sa))

			return -1;

	}
@@ -253,8 +254,8 @@ int mesh_rmc_check(u8 *sa, struct ieee80211s_hdr *mesh_hdr, 
	return 0;

}



int

mesh_add_meshconf_ie(struct sk_buff *skb, struct ieee80211_sub_if_data *sdata)

int mesh_add_meshconf_ie(struct ieee80211_sub_if_data *sdata,

			 struct sk_buff *skb)

{

	struct ieee80211_if_mesh *ifmsh = &sdata->u.mesh;

	u8 *pos, neighbors;
@@ -296,8 +297,7 @@ mesh_add_meshconf_ie(struct sk_buff *skb, struct ieee80211_sub_if_data *sdata) 
	return 0;

}



int

mesh_add_meshid_ie(struct sk_buff *skb, struct ieee80211_sub_if_data *sdata)

int mesh_add_meshid_ie(struct ieee80211_sub_if_data *sdata, struct sk_buff *skb)

{

	struct ieee80211_if_mesh *ifmsh = &sdata->u.mesh;

	u8 *pos;
@@ -314,8 +314,8 @@ mesh_add_meshid_ie(struct sk_buff *skb, struct ieee80211_sub_if_data *sdata) 
	return 0;

}



int mesh_add_awake_window_ie(struct sk_buff *skb,

			     struct ieee80211_sub_if_data *sdata)

static int mesh_add_awake_window_ie(struct ieee80211_sub_if_data *sdata,

				    struct sk_buff *skb)

{

	struct ieee80211_if_mesh *ifmsh = &sdata->u.mesh;

	u8 *pos;
@@ -337,8 +337,8 @@ int mesh_add_awake_window_ie(struct sk_buff *skb, 
	return 0;

}



int

mesh_add_vendor_ies(struct sk_buff *skb, struct ieee80211_sub_if_data *sdata)

int mesh_add_vendor_ies(struct ieee80211_sub_if_data *sdata,

			struct sk_buff *skb)

{

	struct ieee80211_if_mesh *ifmsh = &sdata->u.mesh;

	u8 offset, len;
@@ -361,8 +361,7 @@ mesh_add_vendor_ies(struct sk_buff *skb, struct ieee80211_sub_if_data *sdata) 
	return 0;

}



int

mesh_add_rsn_ie(struct sk_buff *skb, struct ieee80211_sub_if_data *sdata)

int mesh_add_rsn_ie(struct ieee80211_sub_if_data *sdata, struct sk_buff *skb)

{

	struct ieee80211_if_mesh *ifmsh = &sdata->u.mesh;

	u8 len = 0;
@@ -390,8 +389,8 @@ mesh_add_rsn_ie(struct sk_buff *skb, struct ieee80211_sub_if_data *sdata) 
	return 0;

}



int mesh_add_ds_params_ie(struct sk_buff *skb,

			  struct ieee80211_sub_if_data *sdata)

static int mesh_add_ds_params_ie(struct ieee80211_sub_if_data *sdata,

				 struct sk_buff *skb)

{

	struct ieee80211_chanctx_conf *chanctx_conf;

	struct ieee80211_channel *chan;
@@ -417,8 +416,8 @@ int mesh_add_ds_params_ie(struct sk_buff *skb, 
	return 0;

}



int mesh_add_ht_cap_ie(struct sk_buff *skb,

		       struct ieee80211_sub_if_data *sdata)

int mesh_add_ht_cap_ie(struct ieee80211_sub_if_data *sdata,

		       struct sk_buff *skb)

{

	struct ieee80211_local *local = sdata->local;

	enum ieee80211_band band = ieee80211_get_sdata_band(sdata);
@@ -439,8 +438,8 @@ int mesh_add_ht_cap_ie(struct sk_buff *skb, 
	return 0;

}



int mesh_add_ht_oper_ie(struct sk_buff *skb,

			struct ieee80211_sub_if_data *sdata)

int mesh_add_ht_oper_ie(struct ieee80211_sub_if_data *sdata,

			struct sk_buff *skb)

{

	struct ieee80211_local *local = sdata->local;

	struct ieee80211_chanctx_conf *chanctx_conf;
@@ -475,6 +474,7 @@ int mesh_add_ht_oper_ie(struct sk_buff *skb, 


	return 0;

}



static void ieee80211_mesh_path_timer(unsigned long data)

{

	struct ieee80211_sub_if_data *sdata =
@@ -551,8 +551,8 @@ int ieee80211_fill_mesh_addresses(struct ieee80211_hdr *hdr, __le16 *fc, 


/**

 * ieee80211_new_mesh_header - create a new mesh header

 * @meshhdr:    uninitialized mesh header

 * @sdata:	mesh interface to be used

 * @meshhdr:    uninitialized mesh header

 * @addr4or5:   1st address in the ae header, which may correspond to address 4

 *              (if addr6 is NULL) or address 5 (if addr6 is present). It may

 *              be NULL.
@@ -561,32 +561,38 @@ int ieee80211_fill_mesh_addresses(struct ieee80211_hdr *hdr, __le16 *fc, 
 *

 * Return the header length.

 */

int ieee80211_new_mesh_header(struct ieee80211s_hdr *meshhdr,

		struct ieee80211_sub_if_data *sdata, char *addr4or5,

		char *addr6)

int ieee80211_new_mesh_header(struct ieee80211_sub_if_data *sdata,

			      struct ieee80211s_hdr *meshhdr,

			      const char *addr4or5, const char *addr6)

{

	int aelen = 0;

	BUG_ON(!addr4or5 && addr6);

	if (WARN_ON(!addr4or5 && addr6))

		return 0;



	memset(meshhdr, 0, sizeof(*meshhdr));



	meshhdr->ttl = sdata->u.mesh.mshcfg.dot11MeshTTL;



	/* FIXME: racy -- TX on multiple queues can be concurrent */

	put_unaligned(cpu_to_le32(sdata->u.mesh.mesh_seqnum), &meshhdr->seqnum);

	sdata->u.mesh.mesh_seqnum++;



	if (addr4or5 && !addr6) {

		meshhdr->flags |= MESH_FLAGS_AE_A4;

		aelen += ETH_ALEN;

		memcpy(meshhdr->eaddr1, addr4or5, ETH_ALEN);

		return 2 * ETH_ALEN;

	} else if (addr4or5 && addr6) {

		meshhdr->flags |= MESH_FLAGS_AE_A5_A6;

		aelen += 2 * ETH_ALEN;

		memcpy(meshhdr->eaddr1, addr4or5, ETH_ALEN);

		memcpy(meshhdr->eaddr2, addr6, ETH_ALEN);

		return 3 * ETH_ALEN;

	}

	return 6 + aelen;



	return ETH_ALEN;

}



static void ieee80211_mesh_housekeeping(struct ieee80211_sub_if_data *sdata,

			   struct ieee80211_if_mesh *ifmsh)

static void ieee80211_mesh_housekeeping(struct ieee80211_sub_if_data *sdata)

{

	struct ieee80211_if_mesh *ifmsh = &sdata->u.mesh;

	u32 changed;



	ieee80211_sta_expire(sdata, IEEE80211_MESH_PEER_INACTIVITY_LIMIT);
@@ -596,7 +602,8 @@ static void ieee80211_mesh_housekeeping(struct ieee80211_sub_if_data *sdata, 
	ieee80211_mbss_info_change_notify(sdata, changed);



	mod_timer(&ifmsh->housekeeping_timer,

		  round_jiffies(jiffies + IEEE80211_MESH_HOUSEKEEPING_INTERVAL));

		  round_jiffies(jiffies +

				IEEE80211_MESH_HOUSEKEEPING_INTERVAL));

}



static void ieee80211_mesh_rootpath(struct ieee80211_sub_if_data *sdata)
@@ -708,7 +715,7 @@ ieee80211_mesh_build_beacon(struct ieee80211_if_mesh *ifmsh) 
	*pos++ = 0x0;



	if (ieee80211_add_srates_ie(sdata, skb, true, band) ||

	    mesh_add_ds_params_ie(skb, sdata))

	    mesh_add_ds_params_ie(sdata, skb))

		goto out_free;



	bcn->head_len = skb->len;
@@ -719,13 +726,13 @@ ieee80211_mesh_build_beacon(struct ieee80211_if_mesh *ifmsh) 
	bcn->tail = bcn->head + bcn->head_len;



	if (ieee80211_add_ext_srates_ie(sdata, skb, true, band) ||

	    mesh_add_rsn_ie(skb, sdata) ||

	    mesh_add_ht_cap_ie(skb, sdata) ||

	    mesh_add_ht_oper_ie(skb, sdata) ||

	    mesh_add_meshid_ie(skb, sdata) ||

	    mesh_add_meshconf_ie(skb, sdata) ||

	    mesh_add_awake_window_ie(skb, sdata) ||

	    mesh_add_vendor_ies(skb, sdata))

	    mesh_add_rsn_ie(sdata, skb) ||

	    mesh_add_ht_cap_ie(sdata, skb) ||

	    mesh_add_ht_oper_ie(sdata, skb) ||

	    mesh_add_meshid_ie(sdata, skb) ||

	    mesh_add_meshconf_ie(sdata, skb) ||

	    mesh_add_awake_window_ie(sdata, skb) ||

	    mesh_add_vendor_ies(sdata, skb))

		goto out_free;



	bcn->tail_len = skb->len;
@@ -1039,7 +1046,7 @@ void ieee80211_mesh_work(struct ieee80211_sub_if_data *sdata) 
		mesh_mpp_table_grow();



	if (test_and_clear_bit(MESH_WORK_HOUSEKEEPING, &ifmsh->wrkq_flags))

		ieee80211_mesh_housekeeping(sdata, ifmsh);

		ieee80211_mesh_housekeeping(sdata);



	if (test_and_clear_bit(MESH_WORK_ROOT, &ifmsh->wrkq_flags))

		ieee80211_mesh_rootpath(sdata);

net/mac80211/mesh.h

+50 −55
Original line number Diff line number Diff line
@@ -206,38 +206,33 @@ struct mesh_rmc { 
/* Various */

int ieee80211_fill_mesh_addresses(struct ieee80211_hdr *hdr, __le16 *fc,

				  const u8 *da, const u8 *sa);

int ieee80211_new_mesh_header(struct ieee80211s_hdr *meshhdr,

		struct ieee80211_sub_if_data *sdata, char *addr4or5,

		char *addr6);

int mesh_rmc_check(u8 *addr, struct ieee80211s_hdr *mesh_hdr,

		struct ieee80211_sub_if_data *sdata);

int ieee80211_new_mesh_header(struct ieee80211_sub_if_data *sdata,

			      struct ieee80211s_hdr *meshhdr,

			      const char *addr4or5, const char *addr6);

int mesh_rmc_check(struct ieee80211_sub_if_data *sdata,

		   const u8 *addr, struct ieee80211s_hdr *mesh_hdr);

bool mesh_matches_local(struct ieee80211_sub_if_data *sdata,

			struct ieee802_11_elems *ie);

void mesh_ids_set_default(struct ieee80211_if_mesh *mesh);

void mesh_mgmt_ies_add(struct sk_buff *skb,

		struct ieee80211_sub_if_data *sdata);

int mesh_add_meshconf_ie(struct sk_buff *skb,

			 struct ieee80211_sub_if_data *sdata);

int mesh_add_meshid_ie(struct sk_buff *skb,

		       struct ieee80211_sub_if_data *sdata);

int mesh_add_rsn_ie(struct sk_buff *skb,

		    struct ieee80211_sub_if_data *sdata);

int mesh_add_awake_window_ie(struct sk_buff *skb,

			     struct ieee80211_sub_if_data *sdata);

int mesh_add_vendor_ies(struct sk_buff *skb,

			struct ieee80211_sub_if_data *sdata);

int mesh_add_ds_params_ie(struct sk_buff *skb,

			  struct ieee80211_sub_if_data *sdata);

int mesh_add_ht_cap_ie(struct sk_buff *skb,

		       struct ieee80211_sub_if_data *sdata);

int mesh_add_ht_oper_ie(struct sk_buff *skb,

			struct ieee80211_sub_if_data *sdata);

void mesh_mgmt_ies_add(struct ieee80211_sub_if_data *sdata,

		       struct sk_buff *skb);

int mesh_add_meshconf_ie(struct ieee80211_sub_if_data *sdata,

			 struct sk_buff *skb);

int mesh_add_meshid_ie(struct ieee80211_sub_if_data *sdata,

		       struct sk_buff *skb);

int mesh_add_rsn_ie(struct ieee80211_sub_if_data *sdata,

		    struct sk_buff *skb);

int mesh_add_vendor_ies(struct ieee80211_sub_if_data *sdata,

			struct sk_buff *skb);

int mesh_add_ht_cap_ie(struct ieee80211_sub_if_data *sdata,

		       struct sk_buff *skb);

int mesh_add_ht_oper_ie(struct ieee80211_sub_if_data *sdata,

			struct sk_buff *skb);

void mesh_rmc_free(struct ieee80211_sub_if_data *sdata);

int mesh_rmc_init(struct ieee80211_sub_if_data *sdata);

void ieee80211s_init(void);

void ieee80211s_update_metric(struct ieee80211_local *local,

			      struct sta_info *sta, struct sk_buff *skb);

void ieee80211s_stop(void);

void ieee80211_mesh_init_sdata(struct ieee80211_sub_if_data *sdata);

int ieee80211_start_mesh(struct ieee80211_sub_if_data *sdata);

void ieee80211_stop_mesh(struct ieee80211_sub_if_data *sdata);
@@ -263,31 +258,32 @@ void ieee80211_mps_frame_release(struct sta_info *sta, 
				 struct ieee802_11_elems *elems);



/* Mesh paths */

int mesh_nexthop_lookup(struct sk_buff *skb,

		struct ieee80211_sub_if_data *sdata);

int mesh_nexthop_resolve(struct sk_buff *skb,

			 struct ieee80211_sub_if_data *sdata);

int mesh_nexthop_lookup(struct ieee80211_sub_if_data *sdata,

			struct sk_buff *skb);

int mesh_nexthop_resolve(struct ieee80211_sub_if_data *sdata,

			 struct sk_buff *skb);

void mesh_path_start_discovery(struct ieee80211_sub_if_data *sdata);

struct mesh_path *mesh_path_lookup(const u8 *dst,

				   struct ieee80211_sub_if_data *sdata);

struct mesh_path *mpp_path_lookup(u8 *dst,

				  struct ieee80211_sub_if_data *sdata);

int mpp_path_add(u8 *dst, u8 *mpp, struct ieee80211_sub_if_data *sdata);

struct mesh_path *mesh_path_lookup_by_idx(int idx,

		struct ieee80211_sub_if_data *sdata);

struct mesh_path *mesh_path_lookup(struct ieee80211_sub_if_data *sdata,

				   const u8 *dst);

struct mesh_path *mpp_path_lookup(struct ieee80211_sub_if_data *sdata,

				  const u8 *dst);

int mpp_path_add(struct ieee80211_sub_if_data *sdata,

		 const u8 *dst, const u8 *mpp);

struct mesh_path *

mesh_path_lookup_by_idx(struct ieee80211_sub_if_data *sdata, int idx);

void mesh_path_fix_nexthop(struct mesh_path *mpath, struct sta_info *next_hop);

void mesh_path_expire(struct ieee80211_sub_if_data *sdata);

void mesh_rx_path_sel_frame(struct ieee80211_sub_if_data *sdata,

			    struct ieee80211_mgmt *mgmt, size_t len);

int mesh_path_add(const u8 *dst, struct ieee80211_sub_if_data *sdata);

int mesh_path_add(struct ieee80211_sub_if_data *sdata, const u8 *dst);



int mesh_path_add_gate(struct mesh_path *mpath);

int mesh_path_send_to_gates(struct mesh_path *mpath);

int mesh_gate_num(struct ieee80211_sub_if_data *sdata);



/* Mesh plinks */

void mesh_neighbour_update(struct ieee80211_sub_if_data *sdata,

			   u8 *hw_addr,

			   struct ieee802_11_elems *ie);

			   u8 *hw_addr, struct ieee802_11_elems *ie);

bool mesh_peer_accepts_plinks(struct ieee802_11_elems *ie);

u32 mesh_accept_plinks_update(struct ieee80211_sub_if_data *sdata);

void mesh_plink_broken(struct sta_info *sta);
@@ -304,19 +300,19 @@ void mesh_sta_cleanup(struct sta_info *sta); 
void mesh_mpath_table_grow(void);

void mesh_mpp_table_grow(void);

/* Mesh paths */

int mesh_path_error_tx(u8 ttl, const u8 *target, __le32 target_sn,

		       __le16 target_rcode, const u8 *ra,

		       struct ieee80211_sub_if_data *sdata);

int mesh_path_error_tx(struct ieee80211_sub_if_data *sdata,

		       u8 ttl, const u8 *target, __le32 target_sn,

		       __le16 target_rcode, const u8 *ra);

void mesh_path_assign_nexthop(struct mesh_path *mpath, struct sta_info *sta);

void mesh_path_flush_pending(struct mesh_path *mpath);

void mesh_path_tx_pending(struct mesh_path *mpath);

int mesh_pathtbl_init(void);

void mesh_pathtbl_unregister(void);

int mesh_path_del(u8 *addr, struct ieee80211_sub_if_data *sdata);

int mesh_path_del(struct ieee80211_sub_if_data *sdata, const u8 *addr);

void mesh_path_timer(unsigned long data);

void mesh_path_flush_by_nexthop(struct sta_info *sta);

void mesh_path_discard_frame(struct sk_buff *skb,

		struct ieee80211_sub_if_data *sdata);

void mesh_path_discard_frame(struct ieee80211_sub_if_data *sdata,

			     struct sk_buff *skb);

void mesh_path_quiesce(struct ieee80211_sub_if_data *sdata);

void mesh_path_restart(struct ieee80211_sub_if_data *sdata);

void mesh_path_tx_root_frame(struct ieee80211_sub_if_data *sdata);
@@ -325,8 +321,6 @@ bool mesh_action_is_path_sel(struct ieee80211_mgmt *mgmt); 
extern int mesh_paths_generation;



#ifdef CONFIG_MAC80211_MESH

extern int mesh_allocated;



static inline

u32 mesh_plink_inc_estab_count(struct ieee80211_sub_if_data *sdata)

{
@@ -371,8 +365,8 @@ void mesh_plink_quiesce(struct sta_info *sta); 
void mesh_plink_restart(struct sta_info *sta);

void mesh_path_flush_by_iface(struct ieee80211_sub_if_data *sdata);

void mesh_sync_adjust_tbtt(struct ieee80211_sub_if_data *sdata);

void ieee80211s_stop(void);

#else

#define mesh_allocated	0

static inline void

ieee80211_mesh_notify_scan_completed(struct ieee80211_local *local) {}

static inline void ieee80211_mesh_quiesce(struct ieee80211_sub_if_data *sdata)
@@ -385,6 +379,7 @@ static inline bool mesh_path_sel_is_hwmp(struct ieee80211_sub_if_data *sdata) 
{ return false; }

static inline void mesh_path_flush_by_iface(struct ieee80211_sub_if_data *sdata)

{}

static inline void ieee80211s_stop(void) {}

#endif



#endif /* IEEE80211S_H */

net/mac80211/mesh_hwmp.c

+34 −34
Original line number Diff line number Diff line
@@ -238,9 +238,9 @@ static void prepare_frame_for_deferred_tx(struct ieee80211_sub_if_data *sdata, 
 * also acquires in the TX path.  To avoid a deadlock we don't transmit the

 * frame directly but add it to the pending queue instead.

 */

int mesh_path_error_tx(u8 ttl, const u8 *target, __le32 target_sn,

		       __le16 target_rcode, const u8 *ra,

		       struct ieee80211_sub_if_data *sdata)

int mesh_path_error_tx(struct ieee80211_sub_if_data *sdata,

		       u8 ttl, const u8 *target, __le32 target_sn,

		       __le16 target_rcode, const u8 *ra)

{

	struct ieee80211_local *local = sdata->local;

	struct sk_buff *skb;
@@ -430,7 +430,7 @@ static u32 hwmp_route_info_get(struct ieee80211_sub_if_data *sdata, 
		process = false;

		fresh_info = false;

	} else {

		mpath = mesh_path_lookup(orig_addr, sdata);

		mpath = mesh_path_lookup(sdata, orig_addr);

		if (mpath) {

			spin_lock_bh(&mpath->state_lock);

			if (mpath->flags & MESH_PATH_FIXED)
@@ -445,8 +445,8 @@ static u32 hwmp_route_info_get(struct ieee80211_sub_if_data *sdata, 
				}

			}

		} else {

			mesh_path_add(orig_addr, sdata);

			mpath = mesh_path_lookup(orig_addr, sdata);

			mesh_path_add(sdata, orig_addr);

			mpath = mesh_path_lookup(sdata, orig_addr);

			if (!mpath) {

				rcu_read_unlock();

				return 0;
@@ -478,7 +478,7 @@ static u32 hwmp_route_info_get(struct ieee80211_sub_if_data *sdata, 
	else {

		fresh_info = true;



		mpath = mesh_path_lookup(ta, sdata);

		mpath = mesh_path_lookup(sdata, ta);

		if (mpath) {

			spin_lock_bh(&mpath->state_lock);

			if ((mpath->flags & MESH_PATH_FIXED) ||
@@ -486,8 +486,8 @@ static u32 hwmp_route_info_get(struct ieee80211_sub_if_data *sdata, 
					(last_hop_metric > mpath->metric)))

				fresh_info = false;

		} else {

			mesh_path_add(ta, sdata);

			mpath = mesh_path_lookup(ta, sdata);

			mesh_path_add(sdata, ta);

			mpath = mesh_path_lookup(sdata, ta);

			if (!mpath) {

				rcu_read_unlock();

				return 0;
@@ -553,7 +553,7 @@ static void hwmp_preq_frame_process(struct ieee80211_sub_if_data *sdata, 
	} else if (is_broadcast_ether_addr(target_addr) &&

		   (target_flags & IEEE80211_PREQ_TO_FLAG)) {

		rcu_read_lock();

		mpath = mesh_path_lookup(orig_addr, sdata);

		mpath = mesh_path_lookup(sdata, orig_addr);

		if (mpath) {

			if (flags & IEEE80211_PREQ_PROACTIVE_PREP_FLAG) {

				reply = true;
@@ -568,7 +568,7 @@ static void hwmp_preq_frame_process(struct ieee80211_sub_if_data *sdata, 
		rcu_read_unlock();

	} else {

		rcu_read_lock();

		mpath = mesh_path_lookup(target_addr, sdata);

		mpath = mesh_path_lookup(sdata, target_addr);

		if (mpath) {

			if ((!(mpath->flags & MESH_PATH_SN_VALID)) ||

					SN_LT(mpath->sn, target_sn)) {
@@ -678,7 +678,7 @@ static void hwmp_prep_frame_process(struct ieee80211_sub_if_data *sdata, 
	}



	rcu_read_lock();

	mpath = mesh_path_lookup(orig_addr, sdata);

	mpath = mesh_path_lookup(sdata, orig_addr);

	if (mpath)

		spin_lock_bh(&mpath->state_lock);

	else
@@ -736,7 +736,7 @@ static void hwmp_perr_frame_process(struct ieee80211_sub_if_data *sdata, 
	target_rcode = PERR_IE_TARGET_RCODE(perr_elem);



	rcu_read_lock();

	mpath = mesh_path_lookup(target_addr, sdata);

	mpath = mesh_path_lookup(sdata, target_addr);

	if (mpath) {

		struct sta_info *sta;
@@ -751,9 +751,10 @@ static void hwmp_perr_frame_process(struct ieee80211_sub_if_data *sdata, 
			spin_unlock_bh(&mpath->state_lock);

			if (!ifmsh->mshcfg.dot11MeshForwarding)

				goto endperr;

			mesh_path_error_tx(ttl, target_addr, cpu_to_le32(target_sn),

			mesh_path_error_tx(sdata, ttl, target_addr,

					   cpu_to_le32(target_sn),

					   cpu_to_le16(target_rcode),

					   broadcast_addr, sdata);

					   broadcast_addr);

		} else

			spin_unlock_bh(&mpath->state_lock);

	}
@@ -801,10 +802,10 @@ static void hwmp_rann_frame_process(struct ieee80211_sub_if_data *sdata, 


	metric_txsta = airtime_link_metric_get(local, sta);



	mpath = mesh_path_lookup(orig_addr, sdata);

	mpath = mesh_path_lookup(sdata, orig_addr);

	if (!mpath) {

		mesh_path_add(orig_addr, sdata);

		mpath = mesh_path_lookup(orig_addr, sdata);

		mesh_path_add(sdata, orig_addr);

		mpath = mesh_path_lookup(sdata, orig_addr);

		if (!mpath) {

			rcu_read_unlock();

			sdata->u.mesh.mshstats.dropped_frames_no_route++;
@@ -861,8 +862,7 @@ static void hwmp_rann_frame_process(struct ieee80211_sub_if_data *sdata, 




void mesh_rx_path_sel_frame(struct ieee80211_sub_if_data *sdata,

			    struct ieee80211_mgmt *mgmt,

			    size_t len)

			    struct ieee80211_mgmt *mgmt, size_t len)

{

	struct ieee802_11_elems elems;

	size_t baselen;
@@ -1006,7 +1006,7 @@ void mesh_path_start_discovery(struct ieee80211_sub_if_data *sdata) 
	spin_unlock_bh(&ifmsh->mesh_preq_queue_lock);



	rcu_read_lock();

	mpath = mesh_path_lookup(preq_node->dst, sdata);

	mpath = mesh_path_lookup(sdata, preq_node->dst);

	if (!mpath)

		goto enddiscovery;
@@ -1076,8 +1076,8 @@ void mesh_path_start_discovery(struct ieee80211_sub_if_data *sdata) 
 * Returns: 0 if the next hop was found and -ENOENT if the frame was queued.

 * skb is freeed here if no mpath could be allocated.

 */

int mesh_nexthop_resolve(struct sk_buff *skb,

			 struct ieee80211_sub_if_data *sdata)

int mesh_nexthop_resolve(struct ieee80211_sub_if_data *sdata,

			 struct sk_buff *skb)

{

	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;

	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
@@ -1091,17 +1091,17 @@ int mesh_nexthop_resolve(struct sk_buff *skb, 
		return 0;



	rcu_read_lock();

	err = mesh_nexthop_lookup(skb, sdata);

	err = mesh_nexthop_lookup(sdata, skb);

	if (!err)

		goto endlookup;



	/* no nexthop found, start resolving */

	mpath = mesh_path_lookup(target_addr, sdata);

	mpath = mesh_path_lookup(sdata, target_addr);

	if (!mpath) {

		mesh_path_add(target_addr, sdata);

		mpath = mesh_path_lookup(target_addr, sdata);

		mesh_path_add(sdata, target_addr);

		mpath = mesh_path_lookup(sdata, target_addr);

		if (!mpath) {

			mesh_path_discard_frame(skb, sdata);

			mesh_path_discard_frame(sdata, skb);

			err = -ENOSPC;

			goto endlookup;

		}
@@ -1118,12 +1118,13 @@ int mesh_nexthop_resolve(struct sk_buff *skb, 
	skb_queue_tail(&mpath->frame_queue, skb);

	err = -ENOENT;

	if (skb_to_free)

		mesh_path_discard_frame(skb_to_free, sdata);

		mesh_path_discard_frame(sdata, skb_to_free);



endlookup:

	rcu_read_unlock();

	return err;

}



/**

 * mesh_nexthop_lookup - put the appropriate next hop on a mesh frame. Calling

 * this function is considered "using" the associated mpath, so preempt a path
@@ -1134,8 +1135,8 @@ int mesh_nexthop_resolve(struct sk_buff *skb, 
 *

 * Returns: 0 if the next hop was found. Nonzero otherwise.

 */

int mesh_nexthop_lookup(struct sk_buff *skb,

			struct ieee80211_sub_if_data *sdata)

int mesh_nexthop_lookup(struct ieee80211_sub_if_data *sdata,

			struct sk_buff *skb)

{

	struct mesh_path *mpath;

	struct sta_info *next_hop;
@@ -1144,7 +1145,7 @@ int mesh_nexthop_lookup(struct sk_buff *skb, 
	int err = -ENOENT;



	rcu_read_lock();

	mpath = mesh_path_lookup(target_addr, sdata);

	mpath = mesh_path_lookup(sdata, target_addr);



	if (!mpath || !(mpath->flags & MESH_PATH_ACTIVE))

		goto endlookup;
@@ -1203,8 +1204,7 @@ void mesh_path_timer(unsigned long data) 
	}

}



void

mesh_path_tx_root_frame(struct ieee80211_sub_if_data *sdata)

void mesh_path_tx_root_frame(struct ieee80211_sub_if_data *sdata)

{

	struct ieee80211_if_mesh *ifmsh = &sdata->u.mesh;

	u32 interval = ifmsh->mshcfg.dot11MeshHWMPRannInterval;