Merge branch 'bkl-removal' of git://git.lwn.net/linux-2.6

[linux-2.6-omap-h63xx.git] / drivers / staging / wlan-ng / p80211wext.c

diff --git a/drivers/staging/wlan-ng/p80211wext.c b/drivers/staging/wlan-ng/p80211wext.c
index c795a36ad6ff73ba83234a59b36be08391a82ab6..0d570f1f378cd2274df70c0a43c596e5de686e27 100644 (file)
--- a/drivers/staging/wlan-ng/p80211wext.c
+++ b/drivers/staging/wlan-ng/p80211wext.c
@@ -38,7 +38,6 @@
 /* System Includes */
 
 
-#include <linux/version.h>
 
 #include <linux/kernel.h>
 #include <linux/sched.h>
@@ -123,7 +122,7 @@ static const long p80211wext_channel_freq[] = {
        2412, 2417, 2422, 2427, 2432, 2437, 2442,
        2447, 2452, 2457, 2462, 2467, 2472, 2484
 };
-#define NUM_CHANNELS (sizeof(p80211wext_channel_freq) / sizeof(p80211wext_channel_freq[0]))
+#define NUM_CHANNELS ARRAY_SIZE(p80211wext_channel_freq)
 
 /* steal a spare bit to store the shared/opensystems state. should default to open if not set */
 #define HOSTWEP_SHAREDKEY BIT3
@@ -592,7 +591,6 @@ static int p80211wext_siwencode(netdevice_t *dev,
 
        int err = 0;
        int result = 0;
-       int enable = 0;
        int i;
 
        DBFENTER;
@@ -611,13 +609,6 @@ static int p80211wext_siwencode(netdevice_t *dev,
                else
                        i--;
 
-               result = p80211wext_dorequest(wlandev, DIDmib_dot11smt_dot11PrivacyTable_dot11WEPDefaultKeyID, i);
-
-               if (result) {
-                       err = -EFAULT;
-                       goto exit;
-               }
-
                /* Set current key number only if no keys are given */
                if (erq->flags & IW_ENCODE_NOKEY) {
                        result = p80211wext_dorequest(wlandev, DIDmib_dot11smt_dot11PrivacyTable_dot11WEPDefaultKeyID, i);
@@ -1795,7 +1786,7 @@ static iw_handler p80211wext_handlers[] =  {
 };
 
 struct iw_handler_def p80211wext_handler_def = {
-       .num_standard = sizeof(p80211wext_handlers) / sizeof(iw_handler),
+       .num_standard = ARRAY_SIZE(p80211wext_handlers),
        .num_private = 0,
        .num_private_args = 0,
         .standard = p80211wext_handlers,