AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

cfg80211: Ingore country IEs with a zero set of number of channels

Browse Source 
Previous to this and the last patch, titled,

"cfg80211: Fix 2 GHz subband calculation for country IEs"

we would end up treating these IEs as single channel units. These are in
fact just bogus IE triplets so ignore the entire IE if these are found.

Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Luis R. Rodriguez 2010-01-14 13:27:46 -05:00 committed by John W. Linville
parent c99445b140
commit a0f2e0fca1
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
net/wireless/reg.c
View File

@ -585,6 +585,9 @@ static int max_subband_chan(int orig_cur_chan,
break; break;
} }
if (triplet->chans.num_channels == 0)
return 0;
/* Monitonically increasing channel order */ /* Monitonically increasing channel order */
if (triplet->chans.first_channel <= end_subband_chan) if (triplet->chans.first_channel <= end_subband_chan)
return 0; return 0;
@ -737,6 +740,9 @@ static struct ieee80211_regdomain *country_ie_2_rd(
break; break;
} }
if (triplet->chans.num_channels == 0)
return NULL;
/* 2 GHz */ /* 2 GHz */
if (triplet->chans.first_channel <= 14) if (triplet->chans.first_channel <= 14)
end_channel = triplet->chans.first_channel + end_channel = triplet->chans.first_channel +