Commit e99c7cd5 authored Jan 07, 2010 by Luis R. Rodriguez Committed by John W. Linville Jan 14, 2010

cfg80211: fix 2 GHz subband calculation for country IEs



Country IEs triplets are getting an extra channel with
the current count. This does not affect regulatory because
we always took the intersection between what the AP gave
and what CRDA believed is correct.

This however does fix processing some Country IEs with multiple
sequential 2 GHz triplets. Since our parser and the spec mandates
all channels be monitonically increasing we would drop the IE after
noticing the second triplet begins on a channel already processed.
APs that send these type of country IEs seems rare though.

Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

parent 6021e08d

net/wireless/reg.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -740,7 +740,7 @@ static struct ieee80211_regdomain *country_ie_2_rd(
		/* 2 GHz */
		if (triplet->chans.first_channel <= 14)
		end_channel = triplet->chans.first_channel +
		triplet->chans.num_channels;
		triplet->chans.num_channels - 1;
		else
		/*
		* 5 GHz -- For example in country IEs if the first
		@@ -863,7 +863,7 @@ static struct ieee80211_regdomain *country_ie_2_rd(
		/* 2 GHz */
		if (triplet->chans.first_channel <= 14)
		end_channel = triplet->chans.first_channel +
		triplet->chans.num_channels;
		triplet->chans.num_channels -1;
		else
		end_channel = triplet->chans.first_channel +
		(4 * (triplet->chans.num_channels - 1));

Admin message