Adjust build system for Linux 2.6.26

[madwifi/.git] / regression / wep / test_wep.c

diff --git a/regression/wep/test_wep.c b/regression/wep/test_wep.c
index 5a2fed99c65e877b28bfae73273fb260adb71926..6c6574ff6d2001ac782e08a8fbb6b37c868fa22c 100644 (file)
--- a/regression/wep/test_wep.c
+++ b/regression/wep/test_wep.c
@@ -194,6 +194,11 @@ runtest(struct ieee80211vap *vap, struct ciphertest *t)
 
        printk("%s: ", t->name);
 
+       if (!ieee80211_crypto_available(vap, t->cipher)) {
+               printk("FAIL: ieee80211_crypto_available failed\n");
+               return 0;
+       }
+
        /*
         * Setup key.
         */
@@ -312,7 +317,6 @@ MODULE_PARM_DESC(debug, "Enable IEEE80211_MSG_CRYPTO");
 static int __init
 init_crypto_wep_test(void)
 {
-#define        N(a)    (sizeof(a)/sizeof(a[0]))
        struct ieee80211com ic;
        struct ieee80211vap vap;
        int i, pass, total;
@@ -326,7 +330,7 @@ init_crypto_wep_test(void)
        ieee80211_crypto_vattach(&vap);
        pass = 0;
        total = 0;
-       for (i = 0; i < N(weptests); i++)
+       for (i = 0; i < ARRAY_SIZE(weptests); i++)
                if (tests & (1 << i)) {
                        total++;
                        pass += runtest(&vap, &weptests[i]);
@@ -335,7 +339,6 @@ init_crypto_wep_test(void)
        ieee80211_crypto_vdetach(&vap);
        ieee80211_crypto_detach(&ic);
        return (pass == total ? 0 : -ENXIO);
-#undef N
 }
 module_init(init_crypto_wep_test);