Staging: wlan-ng: Move netdevice_t typedef into p80211netdev.h

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

diff --git a/drivers/staging/wlan-ng/prism2mib.c b/drivers/staging/wlan-ng/prism2mib.c
index 873b29f1944a7081b3e17b1d71aa61e7affab8ff..438c2c29891241f9ef16b6b796f6db9ea22a276f 100644 (file)
--- a/drivers/staging/wlan-ng/prism2mib.c
+++ b/drivers/staging/wlan-ng/prism2mib.c
@@ -52,7 +52,6 @@
 
 /*================================================================*/
 /* System Includes */
-#define WLAN_DBVAR     prism2_debug
 
 #include <linux/version.h>
 
@@ -67,6 +66,7 @@
 #include <linux/delay.h>
 #include <asm/byteorder.h>
 #include <linux/usb.h>
+#include <linux/bitops.h>
 
 /*================================================================*/
 /* Project Includes */
@@ -728,7 +728,7 @@ void                         *data)
 
        if (!isget)
                if ((*uint32) % 2) {
-                       WLAN_LOG_WARNING("Attempt to set odd number "
+                       printk(KERN_WARNING "Attempt to set odd number "
                                          "FragmentationThreshold\n");
                        msg->resultcode.data = P80211ENUM_resultcode_not_supported;
                        return(0);
@@ -794,7 +794,7 @@ void                         *data)
                break;
        }
        default:
-               WLAN_LOG_ERROR("Unhandled DID 0x%08x\n", mib->did);
+               printk(KERN_ERR "Unhandled DID 0x%08x\n", mib->did);
        }
 
        return(0);
@@ -996,28 +996,28 @@ void prism2mgmt_get_oprateset(u16 *rate, p80211pstrd_t *pstr)
        datarate = pstr->data;
 
        /* 1 Mbps */
-       if ( BIT0 & (*rate) ) {
+       if ( BIT(0) & (*rate) ) {
                len += (u8)1;
                *datarate = (u8)2;
                datarate++;
        }
 
        /* 2 Mbps */
-       if ( BIT1 & (*rate) ) {
+       if ( BIT(1) & (*rate) ) {
                len += (u8)1;
                *datarate = (u8)4;
                datarate++;
        }
 
        /* 5.5 Mbps */
-       if ( BIT2 & (*rate) ) {
+       if ( BIT(2) & (*rate) ) {
                len += (u8)1;
                *datarate = (u8)11;
                datarate++;
        }
 
        /* 11 Mbps */
-       if ( BIT3 & (*rate) ) {
+       if ( BIT(3) & (*rate) ) {
                len += (u8)1;
                *datarate = (u8)22;
                datarate++;
@@ -1055,16 +1055,16 @@ void prism2mgmt_set_oprateset(u16 *rate, p80211pstrd_t *pstr)
        for ( i=0; i < pstr->len; i++, datarate++ ) {
                switch (*datarate) {
                case 2: /* 1 Mbps */
-                       *rate |= BIT0;
+                       *rate |= BIT(0);
                        break;
                case 4: /* 2 Mbps */
-                       *rate |= BIT1;
+                       *rate |= BIT(1);
                        break;
                case 11: /* 5.5 Mbps */
-                       *rate |= BIT2;
+                       *rate |= BIT(2);
                        break;
                case 22: /* 11 Mbps */
-                       *rate |= BIT3;
+                       *rate |= BIT(3);
                        break;
                default:
                        WLAN_LOG_DEBUG(1, "Unrecoginzed Rate of %d\n",