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>

diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c
index a0ad8e781dd34b68edd27ed7693f8d299f4ff5f4..a36d2c85e26e1e89b7d78d2329036001bf388f2b 100644 (file)
--- a/drivers/net/wireless/rndis_wlan.c
+++ b/drivers/net/wireless/rndis_wlan.c
@@ -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;