Merge branch 'classmate' into release

[safe/jmp/linux-2.6] / drivers / staging / rtl8187se / r8180_wx.c

diff --git a/drivers/staging/rtl8187se/r8180_wx.c b/drivers/staging/rtl8187se/r8180_wx.c
index 081c022..124cde3 100644 (file)
--- a/drivers/staging/rtl8187se/r8180_wx.c
+++ b/drivers/staging/rtl8187se/r8180_wx.c
@@ -27,7 +27,7 @@
 u32 rtl8180_rates[] = {1000000,2000000,5500000,11000000,
        6000000,9000000,12000000,18000000,24000000,36000000,48000000,54000000};
 
-#define RATE_COUNT (sizeof(rtl8180_rates)/sizeof(rtl8180_rates[0]))
+#define RATE_COUNT ARRAY_SIZE(rtl8180_rates)
 
 static CHANNEL_LIST DefaultChannelPlan[] = {
 //     {{1,2,3,4,5,6,7,8,9,10,11,12,13,14},14},                        //Default channel plan
@@ -276,7 +276,7 @@ static int rtl8180_wx_get_range(struct net_device *dev,
        range->max_qual.updated = 7; /* Updated all three */
 
        range->avg_qual.qual = 92; /* > 8% missed beacons is 'bad' */
-       /* TODO: Find real 'good' to 'bad' threshol value for RSSI */
+       /* TODO: Find real 'good' to 'bad' threshold value for RSSI */
        range->avg_qual.level = 20 + -98;
        range->avg_qual.noise = 0;
        range->avg_qual.updated = 7; /* Updated all three */
@@ -377,7 +377,7 @@ static int r8180_wx_set_scan(struct net_device *dev, struct iw_request_info *a,
        //      queue_work(priv->ieee80211->wq, &priv->ieee80211->wx_sync_scan_wq);
                //printk("start scan============================>\n");
                ieee80211_softmac_ips_scan_syncro(priv->ieee80211);
-//ieee80211_start_scan(priv->ieee80211);
+//ieee80211_rtl_start_scan(priv->ieee80211);
                /* intentionally forget to up sem */
 //                     up(&priv->ieee80211->wx_sem);
                        ret = 0;
@@ -1578,9 +1578,9 @@ static struct iw_statistics *r8180_get_wireless_stats(struct net_device *dev)
 
 struct iw_handler_def  r8180_wx_handlers_def={
        .standard = r8180_wx_handlers,
-       .num_standard = sizeof(r8180_wx_handlers) / sizeof(iw_handler),
+       .num_standard = ARRAY_SIZE(r8180_wx_handlers),
        .private = r8180_private_handler,
-       .num_private = sizeof(r8180_private_handler) / sizeof(iw_handler),
+       .num_private = ARRAY_SIZE(r8180_private_handler),
        .num_private_args = sizeof(r8180_private_args) / sizeof(struct iw_priv_args),
        .get_wireless_stats = r8180_get_wireless_stats,
        .private_args = (struct iw_priv_args *)r8180_private_args,