Commit 7bd64366 authored by Zhu Yi's avatar Zhu Yi Committed by John W. Linville
Browse files

[PATCH] ieee80211: Add spectrum management information 



Add spectrum management information and use stat.signal to provide
signal level information.

Signed-off-by: default avatarZhu Yi <yi.zhu@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent d128f6c1

net/ieee80211/ieee80211_wx.c

+29 −2
Original line number Diff line number Diff line
@@ -149,9 +149,7 @@ static char *ipw2100_translate_scan(struct ieee80211_device *ieee, 
		iwe.u.qual.updated |= IW_QUAL_QUAL_INVALID |

		    IW_QUAL_LEVEL_INVALID;

		iwe.u.qual.qual = 0;

		iwe.u.qual.level = 0;

	} else {

		iwe.u.qual.level = network->stats.rssi;

		if (ieee->perfect_rssi == ieee->worst_rssi)

			iwe.u.qual.qual = 100;

		else
@@ -179,6 +177,13 @@ static char *ipw2100_translate_scan(struct ieee80211_device *ieee, 
		iwe.u.qual.noise = network->stats.noise;

	}



	if (!(network->stats.mask & IEEE80211_STATMASK_SIGNAL)) {

		iwe.u.qual.updated |= IW_QUAL_LEVEL_INVALID;

		iwe.u.qual.level = 0;

	} else {

		iwe.u.qual.level = network->stats.signal;

	}



	start = iwe_stream_add_event(start, stop, &iwe, IW_EV_QUAL_LEN);



	iwe.cmd = IWEVCUSTOM;
@@ -229,6 +234,28 @@ static char *ipw2100_translate_scan(struct ieee80211_device *ieee, 
	if (iwe.u.data.length)

		start = iwe_stream_add_point(start, stop, &iwe, custom);



	/* Add spectrum management information */

	iwe.cmd = -1;

	p = custom;

	p += snprintf(p, MAX_CUSTOM_LEN - (p - custom), " Channel flags: ");



	if (ieee80211_get_channel_flags(ieee, network->channel) &

	    IEEE80211_CH_INVALID) {

		iwe.cmd = IWEVCUSTOM;

		p += snprintf(p, MAX_CUSTOM_LEN - (p - custom), "INVALID ");

	}



	if (ieee80211_get_channel_flags(ieee, network->channel) &

	    IEEE80211_CH_RADAR_DETECT) {

		iwe.cmd = IWEVCUSTOM;

		p += snprintf(p, MAX_CUSTOM_LEN - (p - custom), "DFS ");

	}



	if (iwe.cmd == IWEVCUSTOM) {

		iwe.u.data.length = p - custom;

		start = iwe_stream_add_point(start, stop, &iwe, custom);

	}



	return start;

}