UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

rndis_wlan: Use kernel-supplied ARRAY_SIZE() macro. 

Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Robert P. J. Day 2008-06-12 15:34:42 -04:00 committed by John W. Linville
parent 90d07349f8
commit 5720508d9a
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/net/wireless/rndis_wlan.c
View File

@ -640,8 +640,7 @@ static void dsconfig_to_freq(unsigned int dsconfig, struct iw_freq *freq)
static int freq_to_dsconfig(struct iw_freq *freq, unsigned int *dsconfig)
{
if (freq->m < 1000 && freq->e == 0) {
if (freq->m >= 1 &&
freq->m <= (sizeof(freq_chan) / sizeof(freq_chan[0])))
if (freq->m >= 1 && freq->m <= ARRAY_SIZE(freq_chan))
*dsconfig = freq_chan[freq->m - 1] * 1000;
else
return -1;
@ -1179,10 +1178,9 @@ static int rndis_iw_get_range(struct net_device *dev,
range->throughput = 11 * 1000 * 1000 / 2;
}
range->num_channels = (sizeof(freq_chan)/sizeof(freq_chan[0]));
range->num_channels = ARRAY_SIZE(freq_chan);
for (i = 0; i < (sizeof(freq_chan)/sizeof(freq_chan[0])) &&
i < IW_MAX_FREQUENCIES; i++) {
for (i = 0; i < ARRAY_SIZE(freq_chan) && i < IW_MAX_FREQUENCIES; i++) {
range->freq[i].i = i + 1;
range->freq[i].m = freq_chan[i] * 100000;
range->freq[i].e = 1;