]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/blobdiff - drivers/staging/wlan-ng/prism2mgmt.c
Merge branch 'omap-pool'
[linux-2.6-omap-h63xx.git] / drivers / staging / wlan-ng / prism2mgmt.c
index f1727ba6ec6f8c7181064d20b53aef087e9e2dac..e7a7939b42802f80aa1a093ea624a5096b70d637 100644 (file)
 * --------------------------------------------------------------------
 */
 
-/*================================================================*/
-/* System Includes */
-#define WLAN_DBVAR     prism2_debug
-
-
 #include <linux/if_arp.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
@@ -76,8 +71,7 @@
 #include <asm/byteorder.h>
 #include <linux/random.h>
 #include <linux/usb.h>
-
-#include "wlan_compat.h"
+#include <linux/bitops.h>
 
 /*================================================================*/
 /* Project Includes */
 #include "prism2mgmt.h"
 
 /* Converts 802.11 format rate specifications to prism2 */
-#define p80211rate_to_p2bit(n) ((((n)&~BIT7) == 2) ? BIT0 : \
-                                (((n)&~BIT7) == 4) ? BIT1 : \
-                                (((n)&~BIT7) == 11) ? BIT2 : \
-                                (((n)&~BIT7) == 22) ? BIT3 : 0)
+#define p80211rate_to_p2bit(n) ((((n)&~BIT(7)) == 2) ? BIT(0) :  \
+                                (((n)&~BIT(7)) == 4) ? BIT(1) : \
+                                (((n)&~BIT(7)) == 11) ? BIT(2) : \
+                                (((n)&~BIT(7)) == 22) ? BIT(3) : 0)
 
 /*----------------------------------------------------------------
 * prism2mgmt_scan
 ----------------------------------------------------------------*/
 int prism2mgmt_scan(wlandevice_t *wlandev, void *msgp)
 {
-       int                     result = 0;
-       hfa384x_t               *hw = wlandev->priv;
-       p80211msg_dot11req_scan_t       *msg = msgp;
-        u16                  roamingmode, word;
-       int                     i, timeout;
-       int                     istmpenable = 0;
-
-        hfa384x_HostScanRequest_data_t  scanreq;
-
-       DBFENTER;
-
-        /* gatekeeper check */
-        if (HFA384x_FIRMWARE_VERSION(hw->ident_sta_fw.major,
-                                     hw->ident_sta_fw.minor,
-                                     hw->ident_sta_fw.variant) <
-            HFA384x_FIRMWARE_VERSION(1,3,2)) {
-               WLAN_LOG_ERROR("HostScan not supported with current firmware (<1.3.2).\n");
-                result = 1;
-                msg->resultcode.data = P80211ENUM_resultcode_not_supported;
+       int result = 0;
+       hfa384x_t *hw = wlandev->priv;
+       p80211msg_dot11req_scan_t *msg = msgp;
+       u16 roamingmode, word;
+       int i, timeout;
+       int istmpenable = 0;
+
+       hfa384x_HostScanRequest_data_t scanreq;
+
+       /* gatekeeper check */
+       if (HFA384x_FIRMWARE_VERSION(hw->ident_sta_fw.major,
+                                    hw->ident_sta_fw.minor,
+                                    hw->ident_sta_fw.variant) <
+           HFA384x_FIRMWARE_VERSION(1, 3, 2)) {
+               printk(KERN_ERR
+                      "HostScan not supported with current firmware (<1.3.2).\n");
+               result = 1;
+               msg->resultcode.data = P80211ENUM_resultcode_not_supported;
                goto exit;
        }
 
-        memset(&scanreq, 0, sizeof(scanreq));
-
-        /* save current roaming mode */
-        result = hfa384x_drvr_getconfig16(hw,
-                        HFA384x_RID_CNFROAMINGMODE, &roamingmode);
-        if ( result ) {
-                WLAN_LOG_ERROR("getconfig(ROAMMODE) failed. result=%d\n",
-                                result);
-                msg->resultcode.data =
-                        P80211ENUM_resultcode_implementation_failure;
-                goto exit;
-        }
-
-        /* drop into mode 3 for the scan */
-        result = hfa384x_drvr_setconfig16(hw,
-                        HFA384x_RID_CNFROAMINGMODE,
-                       HFA384x_ROAMMODE_HOSTSCAN_HOSTROAM);
-        if ( result ) {
-                WLAN_LOG_ERROR("setconfig(ROAMINGMODE) failed. result=%d\n",
-                                result);
-                msg->resultcode.data =
-                        P80211ENUM_resultcode_implementation_failure;
-                goto exit;
-        }
-
-        /* active or passive? */
-        if (HFA384x_FIRMWARE_VERSION(hw->ident_sta_fw.major,
-                                     hw->ident_sta_fw.minor,
-                                     hw->ident_sta_fw.variant) >
-            HFA384x_FIRMWARE_VERSION(1,5,0)) {
-                if (msg->scantype.data != P80211ENUM_scantype_active) {
-                        word = host2hfa384x_16(msg->maxchanneltime.data);
-                } else {
-                        word = 0;
-                }
-                result = hfa384x_drvr_setconfig16(hw, HFA384x_RID_CNFPASSIVESCANCTRL, word);
-                if ( result ) {
-                        WLAN_LOG_WARNING("Passive scan not supported with "
-                                         "current firmware.  (<1.5.1)\n");
-                }
-        }
+       memset(&scanreq, 0, sizeof(scanreq));
+
+       /* save current roaming mode */
+       result = hfa384x_drvr_getconfig16(hw,
+                                         HFA384x_RID_CNFROAMINGMODE,
+                                         &roamingmode);
+       if (result) {
+               printk(KERN_ERR "getconfig(ROAMMODE) failed. result=%d\n",
+                      result);
+               msg->resultcode.data =
+                   P80211ENUM_resultcode_implementation_failure;
+               goto exit;
+       }
+
+       /* drop into mode 3 for the scan */
+       result = hfa384x_drvr_setconfig16(hw,
+                                         HFA384x_RID_CNFROAMINGMODE,
+                                         HFA384x_ROAMMODE_HOSTSCAN_HOSTROAM);
+       if (result) {
+               printk(KERN_ERR "setconfig(ROAMINGMODE) failed. result=%d\n",
+                      result);
+               msg->resultcode.data =
+                   P80211ENUM_resultcode_implementation_failure;
+               goto exit;
+       }
+
+       /* active or passive? */
+       if (HFA384x_FIRMWARE_VERSION(hw->ident_sta_fw.major,
+                                    hw->ident_sta_fw.minor,
+                                    hw->ident_sta_fw.variant) >
+           HFA384x_FIRMWARE_VERSION(1, 5, 0)) {
+               if (msg->scantype.data != P80211ENUM_scantype_active)
+                       word = cpu_to_le16(msg->maxchanneltime.data);
+               else
+                       word = 0;
+
+               result =
+                   hfa384x_drvr_setconfig16(hw, HFA384x_RID_CNFPASSIVESCANCTRL,
+                                            word);
+               if (result) {
+                       printk(KERN_WARNING "Passive scan not supported with "
+                              "current firmware.  (<1.5.1)\n");
+               }
+       }
 
        /* set up the txrate to be 2MBPS. Should be fastest basicrate... */
        word = HFA384x_RATEBIT_2;
-       scanreq.txRate = host2hfa384x_16(word);
-
-        /* set up the channel list */
-        word = 0;
-        for (i = 0; i < msg->channellist.data.len; i++) {
-                u8 channel = msg->channellist.data.data[i];
-                if (channel > 14) continue;
-                /* channel 1 is BIT0 ... channel 14 is BIT13 */
-                word |= (1 << (channel-1));
-        }
-        scanreq.channelList = host2hfa384x_16(word);
-
-        /* set up the ssid, if present. */
-        scanreq.ssid.len = host2hfa384x_16(msg->ssid.data.len);
-        memcpy(scanreq.ssid.data, msg->ssid.data.data, msg->ssid.data.len);
+       scanreq.txRate = cpu_to_le16(word);
+
+       /* set up the channel list */
+       word = 0;
+       for (i = 0; i < msg->channellist.data.len; i++) {
+               u8 channel = msg->channellist.data.data[i];
+               if (channel > 14)
+                       continue;
+               /* channel 1 is BIT 0 ... channel 14 is BIT 13 */
+               word |= (1 << (channel - 1));
+       }
+       scanreq.channelList = cpu_to_le16(word);
+
+       /* set up the ssid, if present. */
+       scanreq.ssid.len = cpu_to_le16(msg->ssid.data.len);
+       memcpy(scanreq.ssid.data, msg->ssid.data.data, msg->ssid.data.len);
 
        /* Enable the MAC port if it's not already enabled  */
        result = hfa384x_drvr_getconfig16(hw, HFA384x_RID_PORTSTATUS, &word);
-       if ( result ) {
-               WLAN_LOG_ERROR("getconfig(PORTSTATUS) failed. "
-                               "result=%d\n", result);
+       if (result) {
+               printk(KERN_ERR "getconfig(PORTSTATUS) failed. "
+                      "result=%d\n", result);
                msg->resultcode.data =
-                       P80211ENUM_resultcode_implementation_failure;
+                   P80211ENUM_resultcode_implementation_failure;
                goto exit;
        }
        if (word == HFA384x_PORTSTATUS_DISABLED) {
                u16 wordbuf[17];
 
                result = hfa384x_drvr_setconfig16(hw,
-                       HFA384x_RID_CNFROAMINGMODE,
-                       HFA384x_ROAMMODE_HOSTSCAN_HOSTROAM);
-               if ( result ) {
-                       WLAN_LOG_ERROR("setconfig(ROAMINGMODE) failed. result=%d\n", result);
+                                                 HFA384x_RID_CNFROAMINGMODE,
+                                                 HFA384x_ROAMMODE_HOSTSCAN_HOSTROAM);
+               if (result) {
+                       printk(KERN_ERR
+                              "setconfig(ROAMINGMODE) failed. result=%d\n",
+                              result);
                        msg->resultcode.data =
-                               P80211ENUM_resultcode_implementation_failure;
+                           P80211ENUM_resultcode_implementation_failure;
                        goto exit;
                }
                /* Construct a bogus SSID and assign it to OwnSSID and
                 * DesiredSSID
                 */
-               wordbuf[0] = host2hfa384x_16(WLAN_SSID_MAXLEN);
+               wordbuf[0] = cpu_to_le16(WLAN_SSID_MAXLEN);
                get_random_bytes(&wordbuf[1], WLAN_SSID_MAXLEN);
-               result = hfa384x_drvr_setconfig( hw, HFA384x_RID_CNFOWNSSID,
-                               wordbuf, HFA384x_RID_CNFOWNSSID_LEN);
-               if ( result ) {
-                       WLAN_LOG_ERROR("Failed to set OwnSSID.\n");
+               result = hfa384x_drvr_setconfig(hw, HFA384x_RID_CNFOWNSSID,
+                                               wordbuf,
+                                               HFA384x_RID_CNFOWNSSID_LEN);
+               if (result) {
+                       printk(KERN_ERR "Failed to set OwnSSID.\n");
                        msg->resultcode.data =
-                               P80211ENUM_resultcode_implementation_failure;
+                           P80211ENUM_resultcode_implementation_failure;
                        goto exit;
                }
-               result = hfa384x_drvr_setconfig( hw, HFA384x_RID_CNFDESIREDSSID,
-                               wordbuf, HFA384x_RID_CNFDESIREDSSID_LEN);
-               if ( result ) {
-                       WLAN_LOG_ERROR("Failed to set DesiredSSID.\n");
+               result = hfa384x_drvr_setconfig(hw, HFA384x_RID_CNFDESIREDSSID,
+                                               wordbuf,
+                                               HFA384x_RID_CNFDESIREDSSID_LEN);
+               if (result) {
+                       printk(KERN_ERR "Failed to set DesiredSSID.\n");
                        msg->resultcode.data =
-                               P80211ENUM_resultcode_implementation_failure;
+                           P80211ENUM_resultcode_implementation_failure;
                        goto exit;
                }
                /* bsstype */
                result = hfa384x_drvr_setconfig16(hw,
-                               HFA384x_RID_CNFPORTTYPE,
-                               HFA384x_PORTTYPE_IBSS);
-               if ( result ) {
-                       WLAN_LOG_ERROR("Failed to set CNFPORTTYPE.\n");
+                                                 HFA384x_RID_CNFPORTTYPE,
+                                                 HFA384x_PORTTYPE_IBSS);
+               if (result) {
+                       printk(KERN_ERR "Failed to set CNFPORTTYPE.\n");
                        msg->resultcode.data =
-                               P80211ENUM_resultcode_implementation_failure;
+                           P80211ENUM_resultcode_implementation_failure;
                        goto exit;
                }
                /* ibss options */
                result = hfa384x_drvr_setconfig16(hw,
-                               HFA384x_RID_CREATEIBSS,
-                               HFA384x_CREATEIBSS_JOINCREATEIBSS);
-               if ( result ) {
-                       WLAN_LOG_ERROR("Failed to set CREATEIBSS.\n");
+                                                 HFA384x_RID_CREATEIBSS,
+                                                 HFA384x_CREATEIBSS_JOINCREATEIBSS);
+               if (result) {
+                       printk(KERN_ERR "Failed to set CREATEIBSS.\n");
                        msg->resultcode.data =
-                               P80211ENUM_resultcode_implementation_failure;
+                           P80211ENUM_resultcode_implementation_failure;
                        goto exit;
                }
                result = hfa384x_drvr_enable(hw, 0);
-               if ( result ) {
-                       WLAN_LOG_ERROR("drvr_enable(0) failed. "
-                                       "result=%d\n", result);
+               if (result) {
+                       printk(KERN_ERR "drvr_enable(0) failed. "
+                              "result=%d\n", result);
                        msg->resultcode.data =
-                       P80211ENUM_resultcode_implementation_failure;
+                           P80211ENUM_resultcode_implementation_failure;
                        goto exit;
                }
                istmpenable = 1;
        }
 
-        /* Figure out our timeout first Kus, then HZ */
-        timeout = msg->channellist.data.len * msg->maxchanneltime.data;
-       timeout = (timeout * HZ)/1000;
-
-        /* Issue the scan request */
-        hw->scanflag = 0;
+       /* Figure out our timeout first Kus, then HZ */
+       timeout = msg->channellist.data.len * msg->maxchanneltime.data;
+       timeout = (timeout * HZ) / 1000;
 
-       WLAN_HEX_DUMP(5,"hscanreq", &scanreq, sizeof(scanreq));
+       /* Issue the scan request */
+       hw->scanflag = 0;
 
-        result = hfa384x_drvr_setconfig( hw,
-                        HFA384x_RID_HOSTSCAN, &scanreq,
-                        sizeof(hfa384x_HostScanRequest_data_t));
-        if ( result ) {
-                WLAN_LOG_ERROR("setconfig(SCANREQUEST) failed. result=%d\n",
-                                result);
-                msg->resultcode.data =
-                        P80211ENUM_resultcode_implementation_failure;
-                goto exit;
-        }
+       result = hfa384x_drvr_setconfig(hw,
+                                       HFA384x_RID_HOSTSCAN, &scanreq,
+                                       sizeof(hfa384x_HostScanRequest_data_t));
+       if (result) {
+               printk(KERN_ERR "setconfig(SCANREQUEST) failed. result=%d\n",
+                      result);
+               msg->resultcode.data =
+                   P80211ENUM_resultcode_implementation_failure;
+               goto exit;
+       }
 
-        /* sleep until info frame arrives */
-        wait_event_interruptible_timeout(hw->cmdq, hw->scanflag, timeout);
+       /* sleep until info frame arrives */
+       wait_event_interruptible_timeout(hw->cmdq, hw->scanflag, timeout);
 
        msg->numbss.status = P80211ENUM_msgitem_status_data_ok;
        if (hw->scanflag == -1)
@@ -309,16 +308,16 @@ int prism2mgmt_scan(wlandevice_t *wlandev, void *msgp)
 
        msg->numbss.data = hw->scanflag;
 
-        hw->scanflag = 0;
+       hw->scanflag = 0;
 
        /* Disable port if we temporarily enabled it. */
        if (istmpenable) {
                result = hfa384x_drvr_disable(hw, 0);
-               if ( result ) {
-                       WLAN_LOG_ERROR("drvr_disable(0) failed. "
-                                       "result=%d\n", result);
+               if (result) {
+                       printk(KERN_ERR "drvr_disable(0) failed. "
+                              "result=%d\n", result);
                        msg->resultcode.data =
-                       P80211ENUM_resultcode_implementation_failure;
+                           P80211ENUM_resultcode_implementation_failure;
                        goto exit;
                }
        }
@@ -326,25 +325,23 @@ int prism2mgmt_scan(wlandevice_t *wlandev, void *msgp)
        /* restore original roaming mode */
        result = hfa384x_drvr_setconfig16(hw, HFA384x_RID_CNFROAMINGMODE,
                                          roamingmode);
-        if ( result ) {
-                WLAN_LOG_ERROR("setconfig(ROAMMODE) failed. result=%d\n",
-                                result);
-                msg->resultcode.data =
-                        P80211ENUM_resultcode_implementation_failure;
-                goto exit;
-        }
-
-        result = 0;
-        msg->resultcode.data = P80211ENUM_resultcode_success;
-
- exit:
+       if (result) {
+               printk(KERN_ERR "setconfig(ROAMMODE) failed. result=%d\n",
+                      result);
+               msg->resultcode.data =
+                   P80211ENUM_resultcode_implementation_failure;
+               goto exit;
+       }
+
+       result = 0;
+       msg->resultcode.data = P80211ENUM_resultcode_success;
+
+exit:
        msg->resultcode.status = P80211ENUM_msgitem_status_data_ok;
 
-       DBFEXIT;
        return result;
 }
 
-
 /*----------------------------------------------------------------
 * prism2mgmt_scan_results
 *
@@ -367,32 +364,32 @@ int prism2mgmt_scan(wlandevice_t *wlandev, void *msgp)
 ----------------------------------------------------------------*/
 int prism2mgmt_scan_results(wlandevice_t *wlandev, void *msgp)
 {
-       int                     result = 0;
-        p80211msg_dot11req_scan_results_t       *req;
-       hfa384x_t               *hw = wlandev->priv;
+       int result = 0;
+       p80211msg_dot11req_scan_results_t *req;
+       hfa384x_t *hw = wlandev->priv;
        hfa384x_HScanResultSub_t *item = NULL;
 
        int count;
 
-       DBFENTER;
-
-        req = (p80211msg_dot11req_scan_results_t *) msgp;
+       req = (p80211msg_dot11req_scan_results_t *) msgp;
 
        req->resultcode.status = P80211ENUM_msgitem_status_data_ok;
 
-       if (! hw->scanresults) {
-               WLAN_LOG_ERROR("dot11req_scan_results can only be used after a successful dot11req_scan.\n");
+       if (!hw->scanresults) {
+               printk(KERN_ERR
+                      "dot11req_scan_results can only be used after a successful dot11req_scan.\n");
                result = 2;
                req->resultcode.data = P80211ENUM_resultcode_invalid_parameters;
                goto exit;
        }
 
-        count = (hw->scanresults->framelen - 3) / 32;
-       if (count > 32)  count = 32;
+       count = (hw->scanresults->framelen - 3) / 32;
+       if (count > 32)
+               count = 32;
 
        if (req->bssindex.data >= count) {
-               WLAN_LOG_DEBUG(0, "requested index (%d) out of range (%d)\n",
-                               req->bssindex.data, count);
+               pr_debug("requested index (%d) out of range (%d)\n",
+                      req->bssindex.data, count);
                result = 2;
                req->resultcode.data = P80211ENUM_resultcode_invalid_parameters;
                goto exit;
@@ -402,8 +399,8 @@ int prism2mgmt_scan_results(wlandevice_t *wlandev, void *msgp)
        /* signal and noise */
        req->signal.status = P80211ENUM_msgitem_status_data_ok;
        req->noise.status = P80211ENUM_msgitem_status_data_ok;
-       req->signal.data = hfa384x2host_16(item->sl);
-       req->noise.data = hfa384x2host_16(item->anl);
+       req->signal.data = le16_to_cpu(item->sl);
+       req->noise.data = le16_to_cpu(item->anl);
 
        /* BSSID */
        req->bssid.status = P80211ENUM_msgitem_status_data_ok;
@@ -412,13 +409,13 @@ int prism2mgmt_scan_results(wlandevice_t *wlandev, void *msgp)
 
        /* SSID */
        req->ssid.status = P80211ENUM_msgitem_status_data_ok;
-       req->ssid.data.len = hfa384x2host_16(item->ssid.len);
+       req->ssid.data.len = le16_to_cpu(item->ssid.len);
        memcpy(req->ssid.data.data, item->ssid.data, req->ssid.data.len);
 
        /* supported rates */
-        for (count = 0; count < 10 ; count++)
-                if (item->supprates[count] == 0)
-                        break;
+       for (count = 0; count < 10; count++)
+               if (item->supprates[count] == 0)
+                       break;
 
 #define REQBASICRATE(N) \
        if ((count >= N) && DOT11_RATE5_ISBASIC_GET(item->supprates[(N)-1])) { \
@@ -452,7 +449,7 @@ int prism2mgmt_scan_results(wlandevice_t *wlandev, void *msgp)
 
        /* beacon period */
        req->beaconperiod.status = P80211ENUM_msgitem_status_data_ok;
-       req->beaconperiod.data = hfa384x2host_16(item->bcnint);
+       req->beaconperiod.data = le16_to_cpu(item->bcnint);
 
        /* timestamps */
        req->timestamp.status = P80211ENUM_msgitem_status_data_ok;
@@ -462,14 +459,14 @@ int prism2mgmt_scan_results(wlandevice_t *wlandev, void *msgp)
 
        /* atim window */
        req->ibssatimwindow.status = P80211ENUM_msgitem_status_data_ok;
-       req->ibssatimwindow.data = hfa384x2host_16(item->atim);
+       req->ibssatimwindow.data = le16_to_cpu(item->atim);
 
        /* Channel */
        req->dschannel.status = P80211ENUM_msgitem_status_data_ok;
-       req->dschannel.data = hfa384x2host_16(item->chid);
+       req->dschannel.data = le16_to_cpu(item->chid);
 
        /* capinfo bits */
-       count = hfa384x2host_16(item->capinfo);
+       count = le16_to_cpu(item->capinfo);
 
        /* privacy flag */
        req->privacy.status = P80211ENUM_msgitem_status_data_ok;
@@ -484,25 +481,14 @@ int prism2mgmt_scan_results(wlandevice_t *wlandev, void *msgp)
        req->cfpollreq.data = WLAN_GET_MGMT_CAP_INFO_CFPOLLREQ(count);
 
        /* bsstype */
-       req->bsstype.status =  P80211ENUM_msgitem_status_data_ok;
+       req->bsstype.status = P80211ENUM_msgitem_status_data_ok;
        req->bsstype.data = (WLAN_GET_MGMT_CAP_INFO_ESS(count)) ?
-               P80211ENUM_bsstype_infrastructure :
-               P80211ENUM_bsstype_independent;
-
-       // item->proberesp_rate
-/*
-       req->fhdwelltime
-       req->fhhopset
-       req->fhhoppattern
-       req->fhhopindex
-        req->cfpdurremaining
-*/
+           P80211ENUM_bsstype_infrastructure : P80211ENUM_bsstype_independent;
 
        result = 0;
        req->resultcode.data = P80211ENUM_resultcode_success;
 
- exit:
-       DBFEXIT;
+exit:
        return result;
 }
 
@@ -527,15 +513,14 @@ int prism2mgmt_scan_results(wlandevice_t *wlandev, void *msgp)
 ----------------------------------------------------------------*/
 int prism2mgmt_start(wlandevice_t *wlandev, void *msgp)
 {
-       int                     result = 0;
-       hfa384x_t               *hw = wlandev->priv;
-       p80211msg_dot11req_start_t      *msg = msgp;
+       int result = 0;
+       hfa384x_t *hw = wlandev->priv;
+       p80211msg_dot11req_start_t *msg = msgp;
 
-       p80211pstrd_t           *pstr;
-       u8                      bytebuf[80];
-       hfa384x_bytestr_t       *p2bytestr = (hfa384x_bytestr_t*)bytebuf;
-       u16                     word;
-       DBFENTER;
+       p80211pstrd_t *pstr;
+       u8 bytebuf[80];
+       hfa384x_bytestr_t *p2bytestr = (hfa384x_bytestr_t *) bytebuf;
+       u16 word;
 
        wlandev->macmode = WLAN_MACMODE_NONE;
 
@@ -547,7 +532,7 @@ int prism2mgmt_start(wlandevice_t *wlandev, void *msgp)
        if (HFA384x_FIRMWARE_VERSION(hw->ident_sta_fw.major,
                                     hw->ident_sta_fw.minor,
                                     hw->ident_sta_fw.variant) <
-           HFA384x_FIRMWARE_VERSION(0,8,3)) {
+           HFA384x_FIRMWARE_VERSION(0, 8, 3)) {
                /* Ad-Hoc not quite supported on Prism2 */
                msg->resultcode.status = P80211ENUM_msgitem_status_data_ok;
                msg->resultcode.data = P80211ENUM_resultcode_not_supported;
@@ -559,18 +544,19 @@ int prism2mgmt_start(wlandevice_t *wlandev, void *msgp)
        /*** STATION ***/
        /* Set the REQUIRED config items */
        /* SSID */
-       pstr = (p80211pstrd_t*)&(msg->ssid.data);
+       pstr = (p80211pstrd_t *)&(msg->ssid.data);
        prism2mgmt_pstr2bytestr(p2bytestr, pstr);
-       result = hfa384x_drvr_setconfig( hw, HFA384x_RID_CNFOWNSSID,
-                                        bytebuf, HFA384x_RID_CNFOWNSSID_LEN);
-       if ( result ) {
-               WLAN_LOG_ERROR("Failed to set CnfOwnSSID\n");
+       result = hfa384x_drvr_setconfig(hw, HFA384x_RID_CNFOWNSSID,
+                                       bytebuf, HFA384x_RID_CNFOWNSSID_LEN);
+       if (result) {
+               printk(KERN_ERR "Failed to set CnfOwnSSID\n");
                goto failed;
        }
-       result = hfa384x_drvr_setconfig( hw, HFA384x_RID_CNFDESIREDSSID,
-                                        bytebuf, HFA384x_RID_CNFDESIREDSSID_LEN);
-       if ( result ) {
-               WLAN_LOG_ERROR("Failed to set CnfDesiredSSID\n");
+       result = hfa384x_drvr_setconfig(hw, HFA384x_RID_CNFDESIREDSSID,
+                                       bytebuf,
+                                       HFA384x_RID_CNFDESIREDSSID_LEN);
+       if (result) {
+               printk(KERN_ERR "Failed to set CnfDesiredSSID\n");
                goto failed;
        }
 
@@ -581,84 +567,84 @@ int prism2mgmt_start(wlandevice_t *wlandev, void *msgp)
        /* beacon period */
        word = msg->beaconperiod.data;
        result = hfa384x_drvr_setconfig16(hw, HFA384x_RID_CNFAPBCNint, word);
-       if ( result ) {
-               WLAN_LOG_ERROR("Failed to set beacon period=%d.\n", word);
+       if (result) {
+               printk(KERN_ERR "Failed to set beacon period=%d.\n", word);
                goto failed;
        }
 
        /* dschannel */
        word = msg->dschannel.data;
        result = hfa384x_drvr_setconfig16(hw, HFA384x_RID_CNFOWNCHANNEL, word);
-       if ( result ) {
-               WLAN_LOG_ERROR("Failed to set channel=%d.\n", word);
+       if (result) {
+               printk(KERN_ERR "Failed to set channel=%d.\n", word);
                goto failed;
        }
        /* Basic rates */
        word = p80211rate_to_p2bit(msg->basicrate1.data);
-       if ( msg->basicrate2.status == P80211ENUM_msgitem_status_data_ok ) {
+       if (msg->basicrate2.status == P80211ENUM_msgitem_status_data_ok)
                word |= p80211rate_to_p2bit(msg->basicrate2.data);
-       }
-       if ( msg->basicrate3.status == P80211ENUM_msgitem_status_data_ok ) {
+
+       if (msg->basicrate3.status == P80211ENUM_msgitem_status_data_ok)
                word |= p80211rate_to_p2bit(msg->basicrate3.data);
-       }
-       if ( msg->basicrate4.status == P80211ENUM_msgitem_status_data_ok ) {
+
+       if (msg->basicrate4.status == P80211ENUM_msgitem_status_data_ok)
                word |= p80211rate_to_p2bit(msg->basicrate4.data);
-       }
-       if ( msg->basicrate5.status == P80211ENUM_msgitem_status_data_ok ) {
+
+       if (msg->basicrate5.status == P80211ENUM_msgitem_status_data_ok)
                word |= p80211rate_to_p2bit(msg->basicrate5.data);
-       }
-       if ( msg->basicrate6.status == P80211ENUM_msgitem_status_data_ok ) {
+
+       if (msg->basicrate6.status == P80211ENUM_msgitem_status_data_ok)
                word |= p80211rate_to_p2bit(msg->basicrate6.data);
-       }
-       if ( msg->basicrate7.status == P80211ENUM_msgitem_status_data_ok ) {
+
+       if (msg->basicrate7.status == P80211ENUM_msgitem_status_data_ok)
                word |= p80211rate_to_p2bit(msg->basicrate7.data);
-       }
-       if ( msg->basicrate8.status == P80211ENUM_msgitem_status_data_ok ) {
+
+       if (msg->basicrate8.status == P80211ENUM_msgitem_status_data_ok)
                word |= p80211rate_to_p2bit(msg->basicrate8.data);
-       }
+
        result = hfa384x_drvr_setconfig16(hw, HFA384x_RID_CNFBASICRATES, word);
-       if ( result ) {
-               WLAN_LOG_ERROR("Failed to set basicrates=%d.\n", word);
+       if (result) {
+               printk(KERN_ERR "Failed to set basicrates=%d.\n", word);
                goto failed;
        }
 
        /* Operational rates (supprates and txratecontrol) */
        word = p80211rate_to_p2bit(msg->operationalrate1.data);
-       if ( msg->operationalrate2.status == P80211ENUM_msgitem_status_data_ok ) {
+       if (msg->operationalrate2.status == P80211ENUM_msgitem_status_data_ok)
                word |= p80211rate_to_p2bit(msg->operationalrate2.data);
-       }
-       if ( msg->operationalrate3.status == P80211ENUM_msgitem_status_data_ok ) {
+
+       if (msg->operationalrate3.status == P80211ENUM_msgitem_status_data_ok)
                word |= p80211rate_to_p2bit(msg->operationalrate3.data);
-       }
-       if ( msg->operationalrate4.status == P80211ENUM_msgitem_status_data_ok ) {
+
+       if (msg->operationalrate4.status == P80211ENUM_msgitem_status_data_ok)
                word |= p80211rate_to_p2bit(msg->operationalrate4.data);
-       }
-       if ( msg->operationalrate5.status == P80211ENUM_msgitem_status_data_ok ) {
+
+       if (msg->operationalrate5.status == P80211ENUM_msgitem_status_data_ok)
                word |= p80211rate_to_p2bit(msg->operationalrate5.data);
-       }
-       if ( msg->operationalrate6.status == P80211ENUM_msgitem_status_data_ok ) {
+
+       if (msg->operationalrate6.status == P80211ENUM_msgitem_status_data_ok)
                word |= p80211rate_to_p2bit(msg->operationalrate6.data);
-       }
-       if ( msg->operationalrate7.status == P80211ENUM_msgitem_status_data_ok ) {
+
+       if (msg->operationalrate7.status == P80211ENUM_msgitem_status_data_ok)
                word |= p80211rate_to_p2bit(msg->operationalrate7.data);
-       }
-       if ( msg->operationalrate8.status == P80211ENUM_msgitem_status_data_ok ) {
+
+       if (msg->operationalrate8.status == P80211ENUM_msgitem_status_data_ok)
                word |= p80211rate_to_p2bit(msg->operationalrate8.data);
-       }
+
        result = hfa384x_drvr_setconfig16(hw, HFA384x_RID_CNFSUPPRATES, word);
-       if ( result ) {
-               WLAN_LOG_ERROR("Failed to set supprates=%d.\n", word);
+       if (result) {
+               printk(KERN_ERR "Failed to set supprates=%d.\n", word);
                goto failed;
        }
 
        result = hfa384x_drvr_setconfig16(hw, HFA384x_RID_TXRATECNTL, word);
-       if ( result ) {
-               WLAN_LOG_ERROR("Failed to set txrates=%d.\n", word);
+       if (result) {
+               printk(KERN_ERR "Failed to set txrates=%d.\n", word);
                goto failed;
        }
 
        /* Set the macmode so the frame setup code knows what to do */
-       if ( msg->bsstype.data == P80211ENUM_bsstype_independent ) {
+       if (msg->bsstype.data == P80211ENUM_bsstype_independent) {
                wlandev->macmode = WLAN_MACMODE_IBSS_STA;
                /* lets extend the data length a bit */
                hfa384x_drvr_setconfig16(hw, HFA384x_RID_CNFMAXDATALEN, 2304);
@@ -666,8 +652,8 @@ int prism2mgmt_start(wlandevice_t *wlandev, void *msgp)
 
        /* Enable the Port */
        result = hfa384x_drvr_enable(hw, 0);
-       if ( result ) {
-               WLAN_LOG_ERROR("Enable macport failed, result=%d.\n", result);
+       if (result) {
+               printk(KERN_ERR "Enable macport failed, result=%d.\n", result);
                goto failed;
        }
 
@@ -675,13 +661,12 @@ int prism2mgmt_start(wlandevice_t *wlandev, void *msgp)
 
        goto done;
 failed:
-       WLAN_LOG_DEBUG(1, "Failed to set a config option, result=%d\n", result);
+       pr_debug("Failed to set a config option, result=%d\n", result);
        msg->resultcode.data = P80211ENUM_resultcode_invalid_parameters;
 
 done:
        result = 0;
 
-       DBFEXIT;
        return result;
 }
 
@@ -705,40 +690,35 @@ done:
 ----------------------------------------------------------------*/
 int prism2mgmt_readpda(wlandevice_t *wlandev, void *msgp)
 {
-       hfa384x_t               *hw = wlandev->priv;
-       p80211msg_p2req_readpda_t       *msg = msgp;
-       int                             result;
-       DBFENTER;
+       hfa384x_t *hw = wlandev->priv;
+       p80211msg_p2req_readpda_t *msg = msgp;
+       int result;
 
        /* We only support collecting the PDA when in the FWLOAD
         * state.
         */
        if (wlandev->msdstate != WLAN_MSD_FWLOAD) {
-               WLAN_LOG_ERROR(
-                       "PDA may only be read "
-                       "in the fwload state.\n");
+               printk(KERN_ERR
+                      "PDA may only be read " "in the fwload state.\n");
                msg->resultcode.data =
-                       P80211ENUM_resultcode_implementation_failure;
+                   P80211ENUM_resultcode_implementation_failure;
                msg->resultcode.status = P80211ENUM_msgitem_status_data_ok;
        } else {
                /*  Call drvr_readpda(), it handles the auxport enable
                 *  and validating the returned PDA.
                 */
-               result = hfa384x_drvr_readpda(
-                       hw,
-                       msg->pda.data,
-                       HFA384x_PDA_LEN_MAX);
+               result = hfa384x_drvr_readpda(hw,
+                                             msg->pda.data,
+                                             HFA384x_PDA_LEN_MAX);
                if (result) {
-                       WLAN_LOG_ERROR(
-                               "hfa384x_drvr_readpda() failed, "
-                               "result=%d\n",
-                               result);
+                       printk(KERN_ERR
+                              "hfa384x_drvr_readpda() failed, "
+                              "result=%d\n", result);
 
                        msg->resultcode.data =
-                               P80211ENUM_resultcode_implementation_failure;
+                           P80211ENUM_resultcode_implementation_failure;
                        msg->resultcode.status =
-                               P80211ENUM_msgitem_status_data_ok;
-                       DBFEXIT;
+                           P80211ENUM_msgitem_status_data_ok;
                        return 0;
                }
                msg->pda.status = P80211ENUM_msgitem_status_data_ok;
@@ -746,7 +726,6 @@ int prism2mgmt_readpda(wlandevice_t *wlandev, void *msgp)
                msg->resultcode.status = P80211ENUM_msgitem_status_data_ok;
        }
 
-       DBFEXIT;
        return 0;
 }
 
@@ -777,30 +756,29 @@ int prism2mgmt_readpda(wlandevice_t *wlandev, void *msgp)
 ----------------------------------------------------------------*/
 int prism2mgmt_ramdl_state(wlandevice_t *wlandev, void *msgp)
 {
-       hfa384x_t               *hw = wlandev->priv;
-       p80211msg_p2req_ramdl_state_t   *msg = msgp;
-       DBFENTER;
+       hfa384x_t *hw = wlandev->priv;
+       p80211msg_p2req_ramdl_state_t *msg = msgp;
 
        if (wlandev->msdstate != WLAN_MSD_FWLOAD) {
-               WLAN_LOG_ERROR(
-                       "ramdl_state(): may only be called "
-                       "in the fwload state.\n");
+               printk(KERN_ERR
+                      "ramdl_state(): may only be called "
+                      "in the fwload state.\n");
                msg->resultcode.data =
-                       P80211ENUM_resultcode_implementation_failure;
+                   P80211ENUM_resultcode_implementation_failure;
                msg->resultcode.status = P80211ENUM_msgitem_status_data_ok;
-               DBFEXIT;
                return 0;
        }
 
        /*
-       ** Note: Interrupts are locked out if this is an AP and are NOT
-       ** locked out if this is a station.
-       */
+        ** Note: Interrupts are locked out if this is an AP and are NOT
+        ** locked out if this is a station.
+        */
 
        msg->resultcode.status = P80211ENUM_msgitem_status_data_ok;
-       if  ( msg->enable.data == P80211ENUM_truth_true ) {
-               if ( hfa384x_drvr_ramdl_enable(hw, msg->exeaddr.data) ) {
-                       msg->resultcode.data = P80211ENUM_resultcode_implementation_failure;
+       if (msg->enable.data == P80211ENUM_truth_true) {
+               if (hfa384x_drvr_ramdl_enable(hw, msg->exeaddr.data)) {
+                       msg->resultcode.data =
+                           P80211ENUM_resultcode_implementation_failure;
                } else {
                        msg->resultcode.data = P80211ENUM_resultcode_success;
                }
@@ -809,11 +787,9 @@ int prism2mgmt_ramdl_state(wlandevice_t *wlandev, void *msgp)
                msg->resultcode.data = P80211ENUM_resultcode_success;
        }
 
-       DBFEXIT;
        return 0;
 }
 
-
 /*----------------------------------------------------------------
 * prism2mgmt_ramdl_write
 *
@@ -836,45 +812,41 @@ int prism2mgmt_ramdl_state(wlandevice_t *wlandev, void *msgp)
 ----------------------------------------------------------------*/
 int prism2mgmt_ramdl_write(wlandevice_t *wlandev, void *msgp)
 {
-       hfa384x_t               *hw = wlandev->priv;
-       p80211msg_p2req_ramdl_write_t   *msg = msgp;
-       u32                     addr;
-       u32                     len;
-       u8                      *buf;
-       DBFENTER;
+       hfa384x_t *hw = wlandev->priv;
+       p80211msg_p2req_ramdl_write_t *msg = msgp;
+       u32 addr;
+       u32 len;
+       u8 *buf;
 
        if (wlandev->msdstate != WLAN_MSD_FWLOAD) {
-               WLAN_LOG_ERROR(
-                       "ramdl_write(): may only be called "
-                       "in the fwload state.\n");
+               printk(KERN_ERR
+                      "ramdl_write(): may only be called "
+                      "in the fwload state.\n");
                msg->resultcode.data =
-                       P80211ENUM_resultcode_implementation_failure;
+                   P80211ENUM_resultcode_implementation_failure;
                msg->resultcode.status = P80211ENUM_msgitem_status_data_ok;
-               DBFEXIT;
                return 0;
        }
 
        msg->resultcode.status = P80211ENUM_msgitem_status_data_ok;
        /* first validate the length */
-       if  ( msg->len.data > sizeof(msg->data.data) ) {
-               msg->resultcode.status = P80211ENUM_resultcode_invalid_parameters;
+       if (msg->len.data > sizeof(msg->data.data)) {
+               msg->resultcode.status =
+                   P80211ENUM_resultcode_invalid_parameters;
                return 0;
        }
        /* call the hfa384x function to do the write */
        addr = msg->addr.data;
        len = msg->len.data;
        buf = msg->data.data;
-       if ( hfa384x_drvr_ramdl_write(hw, addr, buf, len) ) {
+       if (hfa384x_drvr_ramdl_write(hw, addr, buf, len))
                msg->resultcode.data = P80211ENUM_resultcode_refused;
 
-       }
        msg->resultcode.data = P80211ENUM_resultcode_success;
 
-       DBFEXIT;
        return 0;
 }
 
-
 /*----------------------------------------------------------------
 * prism2mgmt_flashdl_state
 *
@@ -902,31 +874,30 @@ int prism2mgmt_ramdl_write(wlandevice_t *wlandev, void *msgp)
 ----------------------------------------------------------------*/
 int prism2mgmt_flashdl_state(wlandevice_t *wlandev, void *msgp)
 {
-       int                     result = 0;
-       hfa384x_t               *hw = wlandev->priv;
-       p80211msg_p2req_flashdl_state_t *msg = msgp;
-       DBFENTER;
+       int result = 0;
+       hfa384x_t *hw = wlandev->priv;
+       p80211msg_p2req_flashdl_state_t *msg = msgp;
 
        if (wlandev->msdstate != WLAN_MSD_FWLOAD) {
-               WLAN_LOG_ERROR(
-                       "flashdl_state(): may only be called "
-                       "in the fwload state.\n");
+               printk(KERN_ERR
+                      "flashdl_state(): may only be called "
+                      "in the fwload state.\n");
                msg->resultcode.data =
-                       P80211ENUM_resultcode_implementation_failure;
+                   P80211ENUM_resultcode_implementation_failure;
                msg->resultcode.status = P80211ENUM_msgitem_status_data_ok;
-               DBFEXIT;
                return 0;
        }
 
        /*
-       ** Note: Interrupts are locked out if this is an AP and are NOT
-       ** locked out if this is a station.
-       */
+        ** Note: Interrupts are locked out if this is an AP and are NOT
+        ** locked out if this is a station.
+        */
 
        msg->resultcode.status = P80211ENUM_msgitem_status_data_ok;
-       if  ( msg->enable.data == P80211ENUM_truth_true ) {
-               if ( hfa384x_drvr_flashdl_enable(hw) ) {
-                       msg->resultcode.data = P80211ENUM_resultcode_implementation_failure;
+       if (msg->enable.data == P80211ENUM_truth_true) {
+               if (hfa384x_drvr_flashdl_enable(hw)) {
+                       msg->resultcode.data =
+                           P80211ENUM_resultcode_implementation_failure;
                } else {
                        msg->resultcode.data = P80211ENUM_resultcode_success;
                }
@@ -943,19 +914,17 @@ int prism2mgmt_flashdl_state(wlandevice_t *wlandev, void *msgp)
                wlandev->msdstate = WLAN_MSD_HWPRESENT;
                result = prism2sta_ifstate(wlandev, P80211ENUM_ifstate_fwload);
                if (result != P80211ENUM_resultcode_success) {
-                       WLAN_LOG_ERROR("prism2sta_ifstate(fwload) failed,"
-                               "P80211ENUM_resultcode=%d\n", result);
+                       printk(KERN_ERR "prism2sta_ifstate(fwload) failed,"
+                              "P80211ENUM_resultcode=%d\n", result);
                        msg->resultcode.data =
-                               P80211ENUM_resultcode_implementation_failure;
+                           P80211ENUM_resultcode_implementation_failure;
                        result = -1;
                }
        }
 
-       DBFEXIT;
        return 0;
 }
 
-
 /*----------------------------------------------------------------
 * prism2mgmt_flashdl_write
 *
@@ -976,47 +945,43 @@ int prism2mgmt_flashdl_state(wlandevice_t *wlandev, void *msgp)
 ----------------------------------------------------------------*/
 int prism2mgmt_flashdl_write(wlandevice_t *wlandev, void *msgp)
 {
-       hfa384x_t               *hw = wlandev->priv;
-       p80211msg_p2req_flashdl_write_t *msg = msgp;
-       u32                     addr;
-       u32                     len;
-       u8                      *buf;
-       DBFENTER;
+       hfa384x_t *hw = wlandev->priv;
+       p80211msg_p2req_flashdl_write_t *msg = msgp;
+       u32 addr;
+       u32 len;
+       u8 *buf;
 
        if (wlandev->msdstate != WLAN_MSD_FWLOAD) {
-               WLAN_LOG_ERROR(
-                       "flashdl_write(): may only be called "
-                       "in the fwload state.\n");
+               printk(KERN_ERR
+                      "flashdl_write(): may only be called "
+                      "in the fwload state.\n");
                msg->resultcode.data =
-                       P80211ENUM_resultcode_implementation_failure;
+                   P80211ENUM_resultcode_implementation_failure;
                msg->resultcode.status = P80211ENUM_msgitem_status_data_ok;
-               DBFEXIT;
                return 0;
        }
 
        /*
-       ** Note: Interrupts are locked out if this is an AP and are NOT
-       ** locked out if this is a station.
-       */
+        ** Note: Interrupts are locked out if this is an AP and are NOT
+        ** locked out if this is a station.
+        */
 
        msg->resultcode.status = P80211ENUM_msgitem_status_data_ok;
        /* first validate the length */
-       if  ( msg->len.data > sizeof(msg->data.data) ) {
+       if (msg->len.data > sizeof(msg->data.data)) {
                msg->resultcode.status =
-                       P80211ENUM_resultcode_invalid_parameters;
+                   P80211ENUM_resultcode_invalid_parameters;
                return 0;
        }
        /* call the hfa384x function to do the write */
        addr = msg->addr.data;
        len = msg->len.data;
        buf = msg->data.data;
-       if ( hfa384x_drvr_flashdl_write(hw, addr, buf, len) ) {
+       if (hfa384x_drvr_flashdl_write(hw, addr, buf, len))
                msg->resultcode.data = P80211ENUM_resultcode_refused;
 
-       }
        msg->resultcode.data = P80211ENUM_resultcode_success;
 
-       DBFEXIT;
        return 0;
 }
 
@@ -1041,15 +1006,14 @@ int prism2mgmt_flashdl_write(wlandevice_t *wlandev, void *msgp)
 ----------------------------------------------------------------*/
 int prism2mgmt_autojoin(wlandevice_t *wlandev, void *msgp)
 {
-       hfa384x_t                       *hw = wlandev->priv;
-       int                     result = 0;
-       u16                     reg;
-       u16                     port_type;
-       p80211msg_lnxreq_autojoin_t     *msg = msgp;
-       p80211pstrd_t           *pstr;
-       u8                      bytebuf[256];
-       hfa384x_bytestr_t       *p2bytestr = (hfa384x_bytestr_t*)bytebuf;
-       DBFENTER;
+       hfa384x_t *hw = wlandev->priv;
+       int result = 0;
+       u16 reg;
+       u16 port_type;
+       p80211msg_lnxreq_autojoin_t *msg = msgp;
+       p80211pstrd_t *pstr;
+       u8 bytebuf[256];
+       hfa384x_bytestr_t *p2bytestr = (hfa384x_bytestr_t *) bytebuf;
 
        wlandev->macmode = WLAN_MACMODE_NONE;
 
@@ -1064,39 +1028,21 @@ int prism2mgmt_autojoin(wlandevice_t *wlandev, void *msgp)
        hfa384x_drvr_setconfig16(hw, HFA384x_RID_TXRATECNTL, 0x000f);
 
        /* Set the auth type */
-       if ( msg->authtype.data == P80211ENUM_authalg_sharedkey ) {
+       if (msg->authtype.data == P80211ENUM_authalg_sharedkey)
                reg = HFA384x_CNFAUTHENTICATION_SHAREDKEY;
-       } else {
+       else
                reg = HFA384x_CNFAUTHENTICATION_OPENSYSTEM;
-       }
+
        hfa384x_drvr_setconfig16(hw, HFA384x_RID_CNFAUTHENTICATION, reg);
 
        /* Set the ssid */
        memset(bytebuf, 0, 256);
-       pstr = (p80211pstrd_t*)&(msg->ssid.data);
+       pstr = (p80211pstrd_t *)&(msg->ssid.data);
        prism2mgmt_pstr2bytestr(p2bytestr, pstr);
-        result = hfa384x_drvr_setconfig(
-                       hw, HFA384x_RID_CNFDESIREDSSID,
-                       bytebuf, HFA384x_RID_CNFDESIREDSSID_LEN);
-#if 0
-       /* we can use the new-fangled auto-unknown mode if the firmware
-          is 1.3.3 or newer */
-       if (HFA384x_FIRMARE_VERSION(hw->ident_sta_fw.major,
-                                   hw->ident_sta_fw.minor,
-                                   hw->ident_sta_fw.variant) >=
-           HFA384x_FIRMWARE_VERSION(1,3,3)) {
-               /* Set up the IBSS options */
-               reg =  HFA384x_CREATEIBSS_JOINESS_JOINCREATEIBSS;
-               hfa384x_drvr_setconfig16(hw, HFA384x_RID_CREATEIBSS, reg);
-
-               /* Set the PortType */
-               port_type = HFA384x_PORTTYPE_IBSS;
-       } else {
-               port_type = HFA384x_PORTTYPE_BSS;
-       }
-#else
+       result = hfa384x_drvr_setconfig(hw, HFA384x_RID_CNFDESIREDSSID,
+                                       bytebuf,
+                                       HFA384x_RID_CNFDESIREDSSID_LEN);
        port_type = HFA384x_PORTTYPE_BSS;
-#endif
        /* Set the PortType */
        hfa384x_drvr_setconfig16(hw, HFA384x_RID_CNFPORTTYPE, port_type);
 
@@ -1107,11 +1053,9 @@ int prism2mgmt_autojoin(wlandevice_t *wlandev, void *msgp)
        msg->resultcode.status = P80211ENUM_msgitem_status_data_ok;
        msg->resultcode.data = P80211ENUM_resultcode_success;
 
-       DBFEXIT;
        return result;
 }
 
-
 /*----------------------------------------------------------------
 * prism2mgmt_wlansniff
 *
@@ -1133,38 +1077,36 @@ int prism2mgmt_autojoin(wlandevice_t *wlandev, void *msgp)
 ----------------------------------------------------------------*/
 int prism2mgmt_wlansniff(wlandevice_t *wlandev, void *msgp)
 {
-       int                     result = 0;
-       p80211msg_lnxreq_wlansniff_t    *msg = msgp;
+       int result = 0;
+       p80211msg_lnxreq_wlansniff_t *msg = msgp;
 
-       hfa384x_t                       *hw = wlandev->priv;
-       u16                     word;
-
-       DBFENTER;
+       hfa384x_t *hw = wlandev->priv;
+       u16 word;
 
        msg->resultcode.status = P80211ENUM_msgitem_status_data_ok;
-       switch (msg->enable.data)
-       {
+       switch (msg->enable.data) {
        case P80211ENUM_truth_false:
                /* Confirm that we're in monitor mode */
-               if ( wlandev->netdev->type == ARPHRD_ETHER ) {
-                       msg->resultcode.data = P80211ENUM_resultcode_invalid_parameters;
+               if (wlandev->netdev->type == ARPHRD_ETHER) {
+                       msg->resultcode.data =
+                           P80211ENUM_resultcode_invalid_parameters;
                        result = 0;
                        goto exit;
                }
                /* Disable monitor mode */
                result = hfa384x_cmd_monitor(hw, HFA384x_MONITOR_DISABLE);
-               if ( result ) {
-                       WLAN_LOG_DEBUG(1,
-                               "failed to disable monitor mode, result=%d\n",
-                               result);
+               if (result) {
+                       printk(KERN_DEBUG
+                              "failed to disable monitor mode, result=%d\n",
+                              result);
                        goto failed;
                }
                /* Disable port 0 */
                result = hfa384x_drvr_disable(hw, 0);
-               if ( result ) {
-                       WLAN_LOG_DEBUG(1,
-                       "failed to disable port 0 after sniffing, result=%d\n",
-                       result);
+               if (result) {
+                       printk(KERN_DEBUG
+                              "failed to disable port 0 after sniffing, result=%d\n",
+                              result);
                        goto failed;
                }
                /* Clear the driver state */
@@ -1172,32 +1114,34 @@ int prism2mgmt_wlansniff(wlandevice_t *wlandev, void *msgp)
 
                /* Restore the wepflags */
                result = hfa384x_drvr_setconfig16(hw,
-                               HFA384x_RID_CNFWEPFLAGS,
-                               hw->presniff_wepflags);
-               if ( result ) {
-                       WLAN_LOG_DEBUG(1,
-                       "failed to restore wepflags=0x%04x, result=%d\n",
-                       hw->presniff_wepflags,
-                       result);
+                                                 HFA384x_RID_CNFWEPFLAGS,
+                                                 hw->presniff_wepflags);
+               if (result) {
+                       printk(KERN_DEBUG
+                              "failed to restore wepflags=0x%04x, result=%d\n",
+                              hw->presniff_wepflags, result);
                        goto failed;
                }
 
                /* Set the port to its prior type and enable (if necessary) */
-               if (hw->presniff_port_type != 0 ) {
+               if (hw->presniff_port_type != 0) {
                        word = hw->presniff_port_type;
                        result = hfa384x_drvr_setconfig16(hw,
-                               HFA384x_RID_CNFPORTTYPE, word);
-                       if ( result ) {
-                               WLAN_LOG_DEBUG(1,
-                               "failed to restore porttype, result=%d\n",
-                               result);
+                                                         HFA384x_RID_CNFPORTTYPE,
+                                                         word);
+                       if (result) {
+                               printk(KERN_DEBUG
+                                      "failed to restore porttype, result=%d\n",
+                                      result);
                                goto failed;
                        }
 
                        /* Enable the port */
                        result = hfa384x_drvr_enable(hw, 0);
-                       if ( result ) {
-                               WLAN_LOG_DEBUG(1, "failed to enable port to presniff setting, result=%d\n", result);
+                       if (result) {
+                               printk(KERN_DEBUG
+                                      "failed to enable port to presniff setting, result=%d\n",
+                                      result);
                                goto failed;
                        }
                } else {
@@ -1205,46 +1149,52 @@ int prism2mgmt_wlansniff(wlandevice_t *wlandev, void *msgp)
 
                }
 
-               WLAN_LOG_INFO("monitor mode disabled\n");
+               printk(KERN_INFO "monitor mode disabled\n");
                msg->resultcode.data = P80211ENUM_resultcode_success;
                result = 0;
                goto exit;
                break;
        case P80211ENUM_truth_true:
                /* Disable the port (if enabled), only check Port 0 */
-               if ( hw->port_enabled[0]) {
+               if (hw->port_enabled[0]) {
                        if (wlandev->netdev->type == ARPHRD_ETHER) {
                                /* Save macport 0 state */
                                result = hfa384x_drvr_getconfig16(hw,
                                                                  HFA384x_RID_CNFPORTTYPE,
-                                                                 &(hw->presniff_port_type));
-                               if ( result ) {
-                                       WLAN_LOG_DEBUG(1,"failed to read porttype, result=%d\n", result);
+                                                                 &(hw->
+                                                                   presniff_port_type));
+                               if (result) {
+                                       printk(KERN_DEBUG
+                                              "failed to read porttype, result=%d\n",
+                                              result);
                                        goto failed;
                                }
                                /* Save the wepflags state */
                                result = hfa384x_drvr_getconfig16(hw,
                                                                  HFA384x_RID_CNFWEPFLAGS,
-                                                                 &(hw->presniff_wepflags));
-                               if ( result ) {
-                                       WLAN_LOG_DEBUG(1,"failed to read wepflags, result=%d\n", result);
+                                                                 &(hw->
+                                                                   presniff_wepflags));
+                               if (result) {
+                                       printk(KERN_DEBUG
+                                              "failed to read wepflags, result=%d\n",
+                                              result);
                                        goto failed;
                                }
                                hfa384x_drvr_stop(hw);
                                result = hfa384x_drvr_start(hw);
-                               if ( result ) {
-                                       WLAN_LOG_DEBUG(1,
-                                                      "failed to restart the card for sniffing, result=%d\n",
-                                                      result);
+                               if (result) {
+                                       printk(KERN_DEBUG
+                                              "failed to restart the card for sniffing, result=%d\n",
+                                              result);
                                        goto failed;
                                }
                        } else {
                                /* Disable the port */
                                result = hfa384x_drvr_disable(hw, 0);
-                               if ( result ) {
-                                       WLAN_LOG_DEBUG(1,
-                                                      "failed to enable port for sniffing, result=%d\n",
-                                                      result);
+                               if (result) {
+                                       printk(KERN_DEBUG
+                                              "failed to enable port for sniffing, result=%d\n",
+                                              result);
                                        goto failed;
                                }
                        }
@@ -1255,14 +1205,14 @@ int prism2mgmt_wlansniff(wlandevice_t *wlandev, void *msgp)
                /* Set the channel we wish to sniff  */
                word = msg->channel.data;
                result = hfa384x_drvr_setconfig16(hw,
-                                                 HFA384x_RID_CNFOWNCHANNEL, word);
-               hw->sniff_channel=word;
+                                                 HFA384x_RID_CNFOWNCHANNEL,
+                                                 word);
+               hw->sniff_channel = word;
 
-               if ( result ) {
-                       WLAN_LOG_DEBUG(1,
-                                      "failed to set channel %d, result=%d\n",
-                                              word,
-                                      result);
+               if (result) {
+                       printk(KERN_DEBUG
+                              "failed to set channel %d, result=%d\n",
+                              word, result);
                        goto failed;
                }
 
@@ -1271,39 +1221,46 @@ int prism2mgmt_wlansniff(wlandevice_t *wlandev, void *msgp)
                        /* Set the port type to pIbss */
                        word = HFA384x_PORTTYPE_PSUEDOIBSS;
                        result = hfa384x_drvr_setconfig16(hw,
-                                                         HFA384x_RID_CNFPORTTYPE, word);
-                       if ( result ) {
-                               WLAN_LOG_DEBUG(1,
-                                              "failed to set porttype %d, result=%d\n",
-                                              word,
-                                              result);
+                                                         HFA384x_RID_CNFPORTTYPE,
+                                                         word);
+                       if (result) {
+                               printk(KERN_DEBUG
+                                      "failed to set porttype %d, result=%d\n",
+                                      word, result);
                                goto failed;
                        }
-                       if ((msg->keepwepflags.status == P80211ENUM_msgitem_status_data_ok) && (msg->keepwepflags.data != P80211ENUM_truth_true)) {
+                       if ((msg->keepwepflags.status ==
+                            P80211ENUM_msgitem_status_data_ok)
+                           && (msg->keepwepflags.data !=
+                               P80211ENUM_truth_true)) {
                                /* Set the wepflags for no decryption */
                                word = HFA384x_WEPFLAGS_DISABLE_TXCRYPT |
-                                       HFA384x_WEPFLAGS_DISABLE_RXCRYPT;
-                               result = hfa384x_drvr_setconfig16(hw, HFA384x_RID_CNFWEPFLAGS, word);
+                                   HFA384x_WEPFLAGS_DISABLE_RXCRYPT;
+                               result =
+                                   hfa384x_drvr_setconfig16(hw,
+                                                            HFA384x_RID_CNFWEPFLAGS,
+                                                            word);
                        }
 
-                       if ( result ) {
-                               WLAN_LOG_DEBUG(1,
-                                              "failed to set wepflags=0x%04x, result=%d\n",
-                                              word,
-                                              result);
+                       if (result) {
+                               printk(KERN_DEBUG
+                                      "failed to set wepflags=0x%04x, result=%d\n",
+                                      word, result);
                                goto failed;
                        }
                }
 
                /* Do we want to strip the FCS in monitor mode? */
-               if ((msg->stripfcs.status == P80211ENUM_msgitem_status_data_ok) && (msg->stripfcs.data == P80211ENUM_truth_true)) {
+               if ((msg->stripfcs.status == P80211ENUM_msgitem_status_data_ok)
+                   && (msg->stripfcs.data == P80211ENUM_truth_true)) {
                        hw->sniff_fcs = 0;
                } else {
                        hw->sniff_fcs = 1;
                }
 
                /* Do we want to truncate the packets? */
-               if (msg->packet_trunc.status == P80211ENUM_msgitem_status_data_ok) {
+               if (msg->packet_trunc.status ==
+                   P80211ENUM_msgitem_status_data_ok) {
                        hw->sniff_truncate = msg->packet_trunc.data;
                } else {
                        hw->sniff_truncate = 0;
@@ -1311,31 +1268,35 @@ int prism2mgmt_wlansniff(wlandevice_t *wlandev, void *msgp)
 
                /* Enable the port */
                result = hfa384x_drvr_enable(hw, 0);
-               if ( result ) {
-                       WLAN_LOG_DEBUG(1,
-                       "failed to enable port for sniffing, result=%d\n",
-                       result);
+               if (result) {
+                       printk(KERN_DEBUG
+                              "failed to enable port for sniffing, result=%d\n",
+                              result);
                        goto failed;
                }
                /* Enable monitor mode */
                result = hfa384x_cmd_monitor(hw, HFA384x_MONITOR_ENABLE);
-               if ( result ) {
-                       WLAN_LOG_DEBUG(1,
-                       "failed to enable monitor mode, result=%d\n",
-                       result);
+               if (result) {
+                       printk(KERN_DEBUG
+                              "failed to enable monitor mode, result=%d\n",
+                              result);
                        goto failed;
                }
 
-               if (wlandev->netdev->type == ARPHRD_ETHER) {
-                       WLAN_LOG_INFO("monitor mode enabled\n");
-               }
+               if (wlandev->netdev->type == ARPHRD_ETHER)
+                       printk(KERN_INFO "monitor mode enabled\n");
 
                /* Set the driver state */
                /* Do we want the prism2 header? */
-               if ((msg->prismheader.status == P80211ENUM_msgitem_status_data_ok) && (msg->prismheader.data == P80211ENUM_truth_true)) {
+               if ((msg->prismheader.status ==
+                    P80211ENUM_msgitem_status_data_ok)
+                   && (msg->prismheader.data == P80211ENUM_truth_true)) {
                        hw->sniffhdr = 0;
                        wlandev->netdev->type = ARPHRD_IEEE80211_PRISM;
-               } else if ((msg->wlanheader.status == P80211ENUM_msgitem_status_data_ok) && (msg->wlanheader.data == P80211ENUM_truth_true)) {
+               } else
+                   if ((msg->wlanheader.status ==
+                        P80211ENUM_msgitem_status_data_ok)
+                       && (msg->wlanheader.data == P80211ENUM_truth_true)) {
                        hw->sniffhdr = 1;
                        wlandev->netdev->type = ARPHRD_IEEE80211_PRISM;
                } else {
@@ -1357,7 +1318,5 @@ failed:
        msg->resultcode.data = P80211ENUM_resultcode_refused;
        result = 0;
 exit:
-
-       DBFEXIT;
        return result;
 }