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

Commit cbf9322e authored by Ashok Nagarajan's avatar Ashok Nagarajan Committed by John W. Linville
Browse files

mac80211: Modify mesh_set_ht_prot_mode() to have less identation 



Determining types of peers is modified to have less indentation. This change is
suggested by Johannes. This patch also corrects the reference in comment to
IEEE 802.11-2012 version.

Signed-off-by: default avatarAshok Nagarajan <ashok@cozybit.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 0e482db8

net/mac80211/mesh_plink.c

+24 −23
Original line number Diff line number Diff line
@@ -105,15 +105,15 @@ static struct sta_info *mesh_plink_alloc(struct ieee80211_sub_if_data *sdata, 
	return sta;

}



/** mesh_set_ht_prot_mode - set correct HT protection mode

/*

 * mesh_set_ht_prot_mode - set correct HT protection mode

 *

 * Section 9.23.3.5 of IEEE 80211s standard describes the protection rules for

 * HT mesh STA in a MBSS. Three HT protection modes are supported for now,

 * non-HT mixed mode, 20MHz-protection and no-protection mode. non-HT mixed

 * mode is selected if any non-HT peers are present in our MBSS.

 * 20MHz-protection mode is selected if all peers in our 20/40MHz MBSS support

 * HT and atleast one HT20 peer is present. Otherwise no-protection mode is

 * selected.

 * Section 9.23.3.5 of IEEE 80211-2012 describes the protection rules for HT

 * mesh STA in a MBSS. Three HT protection modes are supported for now, non-HT

 * mixed mode, 20MHz-protection and no-protection mode. non-HT mixed mode is

 * selected if any non-HT peers are present in our MBSS.  20MHz-protection mode

 * is selected if all peers in our 20/40MHz MBSS support HT and atleast one

 * HT20 peer is present. Otherwise no-protection mode is selected.

 */

static u32 mesh_set_ht_prot_mode(struct ieee80211_sub_if_data *sdata)

{
@@ -128,8 +128,10 @@ static u32 mesh_set_ht_prot_mode(struct ieee80211_sub_if_data *sdata) 


	rcu_read_lock();

	list_for_each_entry_rcu(sta, &local->sta_list, list) {

		if (sdata == sta->sdata &&

		    sta->plink_state == NL80211_PLINK_ESTAB) {

		if (sdata != sta->sdata ||

		    sta->plink_state != NL80211_PLINK_ESTAB)

			continue;



		switch (sta->ch_type) {

		case NL80211_CHAN_NO_HT:

			mpl_dbg("mesh_plink %pM: nonHT sta (%pM) is present",
@@ -144,7 +146,6 @@ static u32 mesh_set_ht_prot_mode(struct ieee80211_sub_if_data *sdata) 
			break;

		}

	}

	}

out:

	rcu_read_unlock();