]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
Staging: wlan-ng: Remove AP-only code from MLME functions.
authorSolomon Peachy <pizza@shaftnet.org>
Mon, 27 Oct 2008 15:14:02 +0000 (11:14 -0400)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 6 Jan 2009 21:51:54 +0000 (13:51 -0800)
It is not needed in this driver.

Signed-off-by: Solomon Peachy <pizza@shaftnet.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/staging/wlan-ng/hfa384x.h
drivers/staging/wlan-ng/p80211metadef.h
drivers/staging/wlan-ng/p80211metastruct.h
drivers/staging/wlan-ng/prism2mgmt.c
drivers/staging/wlan-ng/prism2mgmt.h
drivers/staging/wlan-ng/prism2sta.c

index d079868d9743fba44d0f7e719766e797313d45d2..289ae0c7c8544a31ba8e1ada68e4e7fd347a250a 100644 (file)
@@ -2547,7 +2547,6 @@ typedef struct hfa384x
        UINT            presniff_port_type;
        UINT16          presniff_wepflags;
        UINT32          dot11_desired_bss_type;
-       int             ap;     /* AP flag: 0 - Station, 1 - Access Point. */
 
        int             dbmadjust;
 
index 35adad8be8cb43a1a03c0db226a2ecd8e0dc1925..fd98f646b289934beba5d36f1f69746eb697511b 100644 (file)
                        (P80211DID_MKSECTION(1) | \
                        P80211DID_MKGROUP(2) | \
                        P80211DID_MKITEM(2) | 0x00000000)
-#define DIDmsg_dot11req_powermgmt \
-                       (P80211DID_MKSECTION(1) | \
-                       P80211DID_MKGROUP(3))
-#define DIDmsg_dot11req_powermgmt_powermgmtmode \
-                       (P80211DID_MKSECTION(1) | \
-                       P80211DID_MKGROUP(3) | \
-                       P80211DID_MKITEM(1) | 0x00000000)
-#define DIDmsg_dot11req_powermgmt_wakeup \
-                       (P80211DID_MKSECTION(1) | \
-                       P80211DID_MKGROUP(3) | \
-                       P80211DID_MKITEM(2) | 0x00000000)
-#define DIDmsg_dot11req_powermgmt_receivedtims \
-                       (P80211DID_MKSECTION(1) | \
-                       P80211DID_MKGROUP(3) | \
-                       P80211DID_MKITEM(3) | 0x00000000)
-#define DIDmsg_dot11req_powermgmt_resultcode \
-                       (P80211DID_MKSECTION(1) | \
-                       P80211DID_MKGROUP(3) | \
-                       P80211DID_MKITEM(4) | 0x00000000)
 #define DIDmsg_dot11req_scan \
                        (P80211DID_MKSECTION(1) | \
                        P80211DID_MKGROUP(4))
                        (P80211DID_MKSECTION(1) | \
                        P80211DID_MKGROUP(5) | \
                        P80211DID_MKITEM(40) | 0x00000000)
-#define DIDmsg_dot11req_join \
-                       (P80211DID_MKSECTION(1) | \
-                       P80211DID_MKGROUP(6))
-#define DIDmsg_dot11req_join_bssid \
-                       (P80211DID_MKSECTION(1) | \
-                       P80211DID_MKGROUP(6) | \
-                       P80211DID_MKITEM(1) | 0x00000000)
-#define DIDmsg_dot11req_join_joinfailuretimeout \
-                       (P80211DID_MKSECTION(1) | \
-                       P80211DID_MKGROUP(6) | \
-                       P80211DID_MKITEM(2) | 0x00000000)
-#define DIDmsg_dot11req_join_basicrate1 \
-                       (P80211DID_MKSECTION(1) | \
-                       P80211DID_MKGROUP(6) | \
-                       P80211DID_MKITEM(3) | 0x00000000)
-#define DIDmsg_dot11req_join_basicrate2 \
-                       (P80211DID_MKSECTION(1) | \
-                       P80211DID_MKGROUP(6) | \
-                       P80211DID_MKITEM(4) | 0x00000000)
-#define DIDmsg_dot11req_join_basicrate3 \
-                       (P80211DID_MKSECTION(1) | \
-                       P80211DID_MKGROUP(6) | \
-                       P80211DID_MKITEM(5) | 0x00000000)
-#define DIDmsg_dot11req_join_basicrate4 \
-                       (P80211DID_MKSECTION(1) | \
-                       P80211DID_MKGROUP(6) | \
-                       P80211DID_MKITEM(6) | 0x00000000)
-#define DIDmsg_dot11req_join_basicrate5 \
-                       (P80211DID_MKSECTION(1) | \
-                       P80211DID_MKGROUP(6) | \
-                       P80211DID_MKITEM(7) | 0x00000000)
-#define DIDmsg_dot11req_join_basicrate6 \
-                       (P80211DID_MKSECTION(1) | \
-                       P80211DID_MKGROUP(6) | \
-                       P80211DID_MKITEM(8) | 0x00000000)
-#define DIDmsg_dot11req_join_basicrate7 \
-                       (P80211DID_MKSECTION(1) | \
-                       P80211DID_MKGROUP(6) | \
-                       P80211DID_MKITEM(9) | 0x00000000)
-#define DIDmsg_dot11req_join_basicrate8 \
-                       (P80211DID_MKSECTION(1) | \
-                       P80211DID_MKGROUP(6) | \
-                       P80211DID_MKITEM(10) | 0x00000000)
-#define DIDmsg_dot11req_join_operationalrate1 \
-                       (P80211DID_MKSECTION(1) | \
-                       P80211DID_MKGROUP(6) | \
-                       P80211DID_MKITEM(11) | 0x00000000)
-#define DIDmsg_dot11req_join_operationalrate2 \
-                       (P80211DID_MKSECTION(1) | \
-                       P80211DID_MKGROUP(6) | \
-                       P80211DID_MKITEM(12) | 0x00000000)
-#define DIDmsg_dot11req_join_operationalrate3 \
-                       (P80211DID_MKSECTION(1) | \
-                       P80211DID_MKGROUP(6) | \
-                       P80211DID_MKITEM(13) | 0x00000000)
-#define DIDmsg_dot11req_join_operationalrate4 \
-                       (P80211DID_MKSECTION(1) | \
-                       P80211DID_MKGROUP(6) | \
-                       P80211DID_MKITEM(14) | 0x00000000)
-#define DIDmsg_dot11req_join_operationalrate5 \
-                       (P80211DID_MKSECTION(1) | \
-                       P80211DID_MKGROUP(6) | \
-                       P80211DID_MKITEM(15) | 0x00000000)
-#define DIDmsg_dot11req_join_operationalrate6 \
-                       (P80211DID_MKSECTION(1) | \
-                       P80211DID_MKGROUP(6) | \
-                       P80211DID_MKITEM(16) | 0x00000000)
-#define DIDmsg_dot11req_join_operationalrate7 \
-                       (P80211DID_MKSECTION(1) | \
-                       P80211DID_MKGROUP(6) | \
-                       P80211DID_MKITEM(17) | 0x00000000)
-#define DIDmsg_dot11req_join_operationalrate8 \
-                       (P80211DID_MKSECTION(1) | \
-                       P80211DID_MKGROUP(6) | \
-                       P80211DID_MKITEM(18) | 0x00000000)
-#define DIDmsg_dot11req_join_resultcode \
-                       (P80211DID_MKSECTION(1) | \
-                       P80211DID_MKGROUP(6) | \
-                       P80211DID_MKITEM(19) | 0x00000000)
-#define DIDmsg_dot11req_authenticate \
-                       (P80211DID_MKSECTION(1) | \
-                       P80211DID_MKGROUP(7))
-#define DIDmsg_dot11req_authenticate_peerstaaddress \
-                       (P80211DID_MKSECTION(1) | \
-                       P80211DID_MKGROUP(7) | \
-                       P80211DID_MKITEM(1) | 0x00000000)
-#define DIDmsg_dot11req_authenticate_authenticationtype \
-                       (P80211DID_MKSECTION(1) | \
-                       P80211DID_MKGROUP(7) | \
-                       P80211DID_MKITEM(2) | 0x00000000)
-#define DIDmsg_dot11req_authenticate_authenticationfailuretimeout \
-                       (P80211DID_MKSECTION(1) | \
-                       P80211DID_MKGROUP(7) | \
-                       P80211DID_MKITEM(3) | 0x00000000)
-#define DIDmsg_dot11req_authenticate_resultcode \
-                       (P80211DID_MKSECTION(1) | \
-                       P80211DID_MKGROUP(7) | \
-                       P80211DID_MKITEM(4) | 0x00000000)
-#define DIDmsg_dot11req_deauthenticate \
-                       (P80211DID_MKSECTION(1) | \
-                       P80211DID_MKGROUP(8))
-#define DIDmsg_dot11req_deauthenticate_peerstaaddress \
-                       (P80211DID_MKSECTION(1) | \
-                       P80211DID_MKGROUP(8) | \
-                       P80211DID_MKITEM(1) | 0x00000000)
-#define DIDmsg_dot11req_deauthenticate_reasoncode \
-                       (P80211DID_MKSECTION(1) | \
-                       P80211DID_MKGROUP(8) | \
-                       P80211DID_MKITEM(2) | 0x00000000)
-#define DIDmsg_dot11req_deauthenticate_resultcode \
-                       (P80211DID_MKSECTION(1) | \
-                       P80211DID_MKGROUP(8) | \
-                       P80211DID_MKITEM(3) | 0x00000000)
 #define DIDmsg_dot11req_associate \
                        (P80211DID_MKSECTION(1) | \
                        P80211DID_MKGROUP(9))
                        (P80211DID_MKSECTION(1) | \
                        P80211DID_MKGROUP(9) | \
                        P80211DID_MKITEM(7) | 0x00000000)
-#define DIDmsg_dot11req_reassociate \
-                       (P80211DID_MKSECTION(1) | \
-                       P80211DID_MKGROUP(10))
-#define DIDmsg_dot11req_reassociate_newapaddress \
-                       (P80211DID_MKSECTION(1) | \
-                       P80211DID_MKGROUP(10) | \
-                       P80211DID_MKITEM(1) | 0x00000000)
-#define DIDmsg_dot11req_reassociate_reassociatefailuretimeout \
-                       (P80211DID_MKSECTION(1) | \
-                       P80211DID_MKGROUP(10) | \
-                       P80211DID_MKITEM(2) | 0x00000000)
-#define DIDmsg_dot11req_reassociate_cfpollable \
-                       (P80211DID_MKSECTION(1) | \
-                       P80211DID_MKGROUP(10) | \
-                       P80211DID_MKITEM(3) | 0x00000000)
-#define DIDmsg_dot11req_reassociate_cfpollreq \
-                       (P80211DID_MKSECTION(1) | \
-                       P80211DID_MKGROUP(10) | \
-                       P80211DID_MKITEM(4) | 0x00000000)
-#define DIDmsg_dot11req_reassociate_privacy \
-                       (P80211DID_MKSECTION(1) | \
-                       P80211DID_MKGROUP(10) | \
-                       P80211DID_MKITEM(5) | 0x00000000)
-#define DIDmsg_dot11req_reassociate_listeninterval \
-                       (P80211DID_MKSECTION(1) | \
-                       P80211DID_MKGROUP(10) | \
-                       P80211DID_MKITEM(6) | 0x00000000)
-#define DIDmsg_dot11req_reassociate_resultcode \
-                       (P80211DID_MKSECTION(1) | \
-                       P80211DID_MKGROUP(10) | \
-                       P80211DID_MKITEM(7) | 0x00000000)
-#define DIDmsg_dot11req_disassociate \
-                       (P80211DID_MKSECTION(1) | \
-                       P80211DID_MKGROUP(11))
-#define DIDmsg_dot11req_disassociate_peerstaaddress \
-                       (P80211DID_MKSECTION(1) | \
-                       P80211DID_MKGROUP(11) | \
-                       P80211DID_MKITEM(1) | 0x00000000)
-#define DIDmsg_dot11req_disassociate_reasoncode \
-                       (P80211DID_MKSECTION(1) | \
-                       P80211DID_MKGROUP(11) | \
-                       P80211DID_MKITEM(2) | 0x00000000)
-#define DIDmsg_dot11req_disassociate_resultcode \
-                       (P80211DID_MKSECTION(1) | \
-                       P80211DID_MKGROUP(11) | \
-                       P80211DID_MKITEM(3) | 0x00000000)
 #define DIDmsg_dot11req_reset \
                        (P80211DID_MKSECTION(1) | \
                        P80211DID_MKGROUP(12))
                        (P80211DID_MKSECTION(5) | \
                        P80211DID_MKGROUP(16) | \
                        P80211DID_MKITEM(2) | 0x00000000)
-#define DIDmsg_p2req_enable \
-                       (P80211DID_MKSECTION(5) | \
-                       P80211DID_MKGROUP(19))
-#define DIDmsg_p2req_enable_resultcode \
-                       (P80211DID_MKSECTION(5) | \
-                       P80211DID_MKGROUP(19) | \
-                       P80211DID_MKITEM(1) | 0x00000000)
 #define DIDmib_cat_dot11smt \
                        P80211DID_MKSECTION(1)
 #define DIDmib_dot11smt_p80211Table \
index 9dc2dc210e127293278adf8334162a7ed74b50a6..5e163817340ea2276beb5561f4c5f41be34c881c 100644 (file)
@@ -66,17 +66,6 @@ typedef struct p80211msg_dot11req_mibset
        p80211item_uint32_t     resultcode      ;
 } __WLAN_ATTRIB_PACK__ p80211msg_dot11req_mibset_t;
 
-typedef struct p80211msg_dot11req_powermgmt
-{
-       UINT32          msgcode ;
-       UINT32          msglen  ;
-       UINT8           devname[WLAN_DEVNAMELEN_MAX]    ;
-       p80211item_uint32_t     powermgmtmode   ;
-       p80211item_uint32_t     wakeup  ;
-       p80211item_uint32_t     receivedtims    ;
-       p80211item_uint32_t     resultcode      ;
-} __WLAN_ATTRIB_PACK__ p80211msg_dot11req_powermgmt_t;
-
 typedef struct p80211msg_dot11req_scan
 {
        UINT32          msgcode ;
@@ -147,56 +136,6 @@ typedef struct p80211msg_dot11req_scan_results
        p80211item_uint32_t     supprate8       ;
 } __WLAN_ATTRIB_PACK__ p80211msg_dot11req_scan_results_t;
 
-typedef struct p80211msg_dot11req_join
-{
-       UINT32          msgcode ;
-       UINT32          msglen  ;
-       UINT8           devname[WLAN_DEVNAMELEN_MAX]    ;
-       p80211item_pstr6_t      bssid   ;
-       UINT8   pad_5C[1]       ;
-       p80211item_uint32_t     joinfailuretimeout      ;
-       p80211item_uint32_t     basicrate1      ;
-       p80211item_uint32_t     basicrate2      ;
-       p80211item_uint32_t     basicrate3      ;
-       p80211item_uint32_t     basicrate4      ;
-       p80211item_uint32_t     basicrate5      ;
-       p80211item_uint32_t     basicrate6      ;
-       p80211item_uint32_t     basicrate7      ;
-       p80211item_uint32_t     basicrate8      ;
-       p80211item_uint32_t     operationalrate1        ;
-       p80211item_uint32_t     operationalrate2        ;
-       p80211item_uint32_t     operationalrate3        ;
-       p80211item_uint32_t     operationalrate4        ;
-       p80211item_uint32_t     operationalrate5        ;
-       p80211item_uint32_t     operationalrate6        ;
-       p80211item_uint32_t     operationalrate7        ;
-       p80211item_uint32_t     operationalrate8        ;
-       p80211item_uint32_t     resultcode      ;
-} __WLAN_ATTRIB_PACK__ p80211msg_dot11req_join_t;
-
-typedef struct p80211msg_dot11req_authenticate
-{
-       UINT32          msgcode ;
-       UINT32          msglen  ;
-       UINT8           devname[WLAN_DEVNAMELEN_MAX]    ;
-       p80211item_pstr6_t      peerstaaddress  ;
-       UINT8   pad_6C[1]       ;
-       p80211item_uint32_t     authenticationtype      ;
-       p80211item_uint32_t     authenticationfailuretimeout    ;
-       p80211item_uint32_t     resultcode      ;
-} __WLAN_ATTRIB_PACK__ p80211msg_dot11req_authenticate_t;
-
-typedef struct p80211msg_dot11req_deauthenticate
-{
-       UINT32          msgcode ;
-       UINT32          msglen  ;
-       UINT8           devname[WLAN_DEVNAMELEN_MAX]    ;
-       p80211item_pstr6_t      peerstaaddress  ;
-       UINT8   pad_7C[1]       ;
-       p80211item_uint32_t     reasoncode      ;
-       p80211item_uint32_t     resultcode      ;
-} __WLAN_ATTRIB_PACK__ p80211msg_dot11req_deauthenticate_t;
-
 typedef struct p80211msg_dot11req_associate
 {
        UINT32          msgcode ;
@@ -212,31 +151,6 @@ typedef struct p80211msg_dot11req_associate
        p80211item_uint32_t     resultcode      ;
 } __WLAN_ATTRIB_PACK__ p80211msg_dot11req_associate_t;
 
-typedef struct p80211msg_dot11req_reassociate
-{
-       UINT32          msgcode ;
-       UINT32          msglen  ;
-       UINT8           devname[WLAN_DEVNAMELEN_MAX]    ;
-       p80211item_pstr6_t      newapaddress    ;
-       UINT8   pad_9C[1]       ;
-       p80211item_uint32_t     reassociatefailuretimeout       ;
-       p80211item_uint32_t     cfpollable      ;
-       p80211item_uint32_t     cfpollreq       ;
-       p80211item_uint32_t     privacy ;
-       p80211item_uint32_t     listeninterval  ;
-       p80211item_uint32_t     resultcode      ;
-} __WLAN_ATTRIB_PACK__ p80211msg_dot11req_reassociate_t;
-
-typedef struct p80211msg_dot11req_disassociate
-{
-       UINT32          msgcode ;
-       UINT32          msglen  ;
-       UINT8           devname[WLAN_DEVNAMELEN_MAX]    ;
-       p80211item_pstr6_t      peerstaaddress  ;
-       UINT8   pad_10C[1]      ;
-       p80211item_uint32_t     reasoncode      ;
-       p80211item_uint32_t     resultcode      ;
-} __WLAN_ATTRIB_PACK__ p80211msg_dot11req_disassociate_t;
 
 typedef struct p80211msg_dot11req_reset
 {
@@ -609,12 +523,4 @@ typedef struct p80211msg_p2req_dump_state
        p80211item_uint32_t     resultcode      ;
 } __WLAN_ATTRIB_PACK__ p80211msg_p2req_dump_state_t;
 
-typedef struct p80211msg_p2req_enable
-{
-       UINT32          msgcode ;
-       UINT32          msglen  ;
-       UINT8           devname[WLAN_DEVNAMELEN_MAX]    ;
-       p80211item_uint32_t     resultcode      ;
-} __WLAN_ATTRIB_PACK__ p80211msg_p2req_enable_t;
-
 #endif
index 5996b640ab3f1da8b64641dfec72c202c0a62076..de2ec1e7c9de1d1d5486fd2113eee0c09915ad7c 100644 (file)
 #include "hfa384x.h"
 #include "prism2mgmt.h"
 
-/*================================================================*/
-/* Local Constants */
-
-
-/*================================================================*/
-/* Local Macros */
-
 /* 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)
 
-/*================================================================*/
-/* Local Types */
-
-
-/*================================================================*/
-/* Local Static Definitions */
-
-
-/*================================================================*/
-/* Local Function Declarations */
-
-
-/*================================================================*/
-/* Function Definitions */
-
-
-/*----------------------------------------------------------------
-* prism2mgmt_powermgmt
-*
-* Set the power management state of this station's MAC.
-*
-* Arguments:
-*      wlandev         wlan device structure
-*      msgp            ptr to msg buffer
-*
-* Returns:
-*      0       success and done
-*      <0      success, but we're waiting for something to finish.
-*      >0      an error occurred while handling the message.
-* Side effects:
-*
-* Call context:
-*      process thread  (usually)
-*      interrupt
-----------------------------------------------------------------*/
-int prism2mgmt_powermgmt(wlandevice_t *wlandev, void *msgp)
-{
-       int                     result = 0;
-       hfa384x_t               *hw = wlandev->priv;
-       p80211msg_dot11req_powermgmt_t  *msg = msgp;
-
-       DBFENTER;
-
-       if (!hw->ap) {
-
-               /*** STATION ***/
-
-               /*
-                * Set CNFPMENABLED (on or off)
-                * Set CNFMULTICASTRX (if PM on, otherwise clear)
-                * Spout a notice stating that SleepDuration and
-                * HoldoverDuration and PMEPS also have an impact.
-                */
-               /* Powermgmt is currently unsupported for STA */
-               msg->resultcode.status = P80211ENUM_msgitem_status_data_ok;
-               msg->resultcode.data = P80211ENUM_resultcode_not_supported;
-       } else {
-
-               /*** ACCESS POINT ***/
-
-               /* Powermgmt is never supported for AP */
-               msg->resultcode.status = P80211ENUM_msgitem_status_data_ok;
-               msg->resultcode.data = P80211ENUM_resultcode_not_supported;
-       }
-
-       DBFEXIT;
-       return result;
-}
-
-
 /*----------------------------------------------------------------
 * prism2mgmt_scan
 *
@@ -217,13 +140,6 @@ int prism2mgmt_scan(wlandevice_t *wlandev, void *msgp)
 
        DBFENTER;
 
-        if (hw->ap) {
-                WLAN_LOG_ERROR("Prism2 in AP mode cannot perform scans.\n");
-                result = 1;
-                msg->resultcode.data = P80211ENUM_resultcode_not_supported;
-                goto exit;
-        }
-
         /* gatekeeper check */
         if (HFA384x_FIRMWARE_VERSION(hw->ident_sta_fw.major,
                                      hw->ident_sta_fw.minor,
@@ -468,12 +384,6 @@ int prism2mgmt_scan_results(wlandevice_t *wlandev, void *msgp)
 
        req->resultcode.status = P80211ENUM_msgitem_status_data_ok;
 
-       if (hw->ap) {
-               result = 1;
-               req->resultcode.data = P80211ENUM_resultcode_not_supported;
-               goto exit;
-       }
-
        if (! hw->scanresults) {
                WLAN_LOG_ERROR("dot11req_scan_results can only be used after a successful dot11req_scan.\n");
                result = 2;
@@ -600,55 +510,6 @@ int prism2mgmt_scan_results(wlandevice_t *wlandev, void *msgp)
        return result;
 }
 
-
-/*----------------------------------------------------------------
-* prism2mgmt_join
-*
-* Join a BSS whose BSS description was previously obtained with
-* a scan.
-*
-* Arguments:
-*      wlandev         wlan device structure
-*      msgp            ptr to msg buffer
-*
-* Returns:
-*      0       success and done
-*      <0      success, but we're waiting for something to finish.
-*      >0      an error occurred while handling the message.
-* Side effects:
-*
-* Call context:
-*      process thread  (usually)
-*      interrupt
-----------------------------------------------------------------*/
-int prism2mgmt_join(wlandevice_t *wlandev, void *msgp)
-{
-       int                     result = 0;
-       hfa384x_t               *hw = wlandev->priv;
-       p80211msg_dot11req_join_t       *msg = msgp;
-       DBFENTER;
-
-       if (!hw->ap) {
-
-               /*** STATION ***/
-
-               /* TODO: Implement after scan */
-               msg->resultcode.status = P80211ENUM_msgitem_status_data_ok;
-               msg->resultcode.data = P80211ENUM_resultcode_not_supported;
-       } else {
-
-               /*** ACCESS POINT ***/
-
-               /* Never supported by APs */
-               msg->resultcode.status = P80211ENUM_msgitem_status_data_ok;
-               msg->resultcode.data = P80211ENUM_resultcode_not_supported;
-       }
-
-       DBFEXIT;
-       return result;
-}
-
-
 /*----------------------------------------------------------------
 * prism2mgmt_p2_join
 *
@@ -680,380 +541,162 @@ int prism2mgmt_p2_join(wlandevice_t *wlandev, void *msgp)
         hfa384x_JoinRequest_data_t     joinreq;
        DBFENTER;
 
-       if (!hw->ap) {
-
-               wlandev->macmode = WLAN_MACMODE_NONE;
-
-               /*** STATION ***/
-               /* Set the PortType */
-               msg->resultcode.status = P80211ENUM_msgitem_status_data_ok;
-               msg->resultcode.data = P80211ENUM_resultcode_success;
-
-               /* ess port */
-               result = hfa384x_drvr_setconfig16(hw, HFA384x_RID_CNFPORTTYPE, 1);
-               if ( result ) {
-                       WLAN_LOG_ERROR("Failed to set Port Type\n");
-                       goto failed;
-               }
-
-               /* Set the auth type */
-               if ( msg->authtype.data == P80211ENUM_authalg_sharedkey ) {
-                       reg = HFA384x_CNFAUTHENTICATION_SHAREDKEY;
-               } else {
-                       reg = HFA384x_CNFAUTHENTICATION_OPENSYSTEM;
-               }
-               result = hfa384x_drvr_setconfig16(hw, HFA384x_RID_CNFAUTHENTICATION, reg);
-               if ( result ) {
-                       WLAN_LOG_ERROR("Failed to set Authentication\n");
-                       goto failed;
-               }
-
-               /* Turn off all roaming */
-               hfa384x_drvr_setconfig16(hw, HFA384x_RID_CNFROAMINGMODE, 3);
-               if ( result ) {
-                       WLAN_LOG_ERROR("Failed to Turn off Roaming\n");
-                       goto failed;
-               }
-
-               /* Basic rates */
-                reg = 0;
-               if ( msg->basicrate1.status == P80211ENUM_msgitem_status_data_ok ) {
-                       reg = p80211rate_to_p2bit(msg->basicrate1.data);
-               }
-               if ( msg->basicrate2.status == P80211ENUM_msgitem_status_data_ok ) {
-                       reg |= p80211rate_to_p2bit(msg->basicrate2.data);
-               }
-               if ( msg->basicrate3.status == P80211ENUM_msgitem_status_data_ok ) {
-                       reg |= p80211rate_to_p2bit(msg->basicrate3.data);
-               }
-               if ( msg->basicrate4.status == P80211ENUM_msgitem_status_data_ok ) {
-                       reg |= p80211rate_to_p2bit(msg->basicrate4.data);
-               }
-               if ( msg->basicrate5.status == P80211ENUM_msgitem_status_data_ok ) {
-                       reg |= p80211rate_to_p2bit(msg->basicrate5.data);
-               }
-               if ( msg->basicrate6.status == P80211ENUM_msgitem_status_data_ok ) {
-                       reg |= p80211rate_to_p2bit(msg->basicrate6.data);
-               }
-               if ( msg->basicrate7.status == P80211ENUM_msgitem_status_data_ok ) {
-                       reg |= p80211rate_to_p2bit(msg->basicrate7.data);
-               }
-               if ( msg->basicrate8.status == P80211ENUM_msgitem_status_data_ok ) {
-                       reg |= p80211rate_to_p2bit(msg->basicrate8.data);
-               }
-               if( reg == 0)
-                        reg = 0x03;
-               result = hfa384x_drvr_setconfig16(hw, HFA384x_RID_CNFBASICRATES, reg);
-               if ( result ) {
-                       WLAN_LOG_ERROR("Failed to set basicrates=%d.\n", reg);
-                       goto failed;
-               }
-
-               /* Operational rates (supprates and txratecontrol) */
-               reg = 0;
-               if ( msg->operationalrate1.status == P80211ENUM_msgitem_status_data_ok ) {
-                       reg = p80211rate_to_p2bit(msg->operationalrate1.data);
-               }
-               if ( msg->operationalrate2.status == P80211ENUM_msgitem_status_data_ok ) {
-                       reg |= p80211rate_to_p2bit(msg->operationalrate2.data);
-               }
-               if ( msg->operationalrate3.status == P80211ENUM_msgitem_status_data_ok ) {
-                       reg |= p80211rate_to_p2bit(msg->operationalrate3.data);
-               }
-               if ( msg->operationalrate4.status == P80211ENUM_msgitem_status_data_ok ) {
-                       reg |= p80211rate_to_p2bit(msg->operationalrate4.data);
-               }
-               if ( msg->operationalrate5.status == P80211ENUM_msgitem_status_data_ok ) {
-                       reg |= p80211rate_to_p2bit(msg->operationalrate5.data);
-               }
-               if ( msg->operationalrate6.status == P80211ENUM_msgitem_status_data_ok ) {
-                       reg |= p80211rate_to_p2bit(msg->operationalrate6.data);
-               }
-               if ( msg->operationalrate7.status == P80211ENUM_msgitem_status_data_ok ) {
-                       reg |= p80211rate_to_p2bit(msg->operationalrate7.data);
-               }
-               if ( msg->operationalrate8.status == P80211ENUM_msgitem_status_data_ok ) {
-                       reg |= p80211rate_to_p2bit(msg->operationalrate8.data);
-               }
-               if( reg == 0)
-                        reg = 0x0f;
-               result = hfa384x_drvr_setconfig16(hw, HFA384x_RID_CNFSUPPRATES, reg);
-               if ( result ) {
-                       WLAN_LOG_ERROR("Failed to set supprates=%d.\n", reg);
-                       goto failed;
-               }
-
-               result = hfa384x_drvr_setconfig16(hw, HFA384x_RID_TXRATECNTL, reg);
-               if ( result ) {
-                       WLAN_LOG_ERROR("Failed to set txrates=%d.\n", reg);
-                       goto failed;
-               }
-
-               /* Set the ssid */
-               memset(bytebuf, 0, 256);
-               pstr = (p80211pstrd_t*)&(msg->ssid.data);
-               prism2mgmt_pstr2bytestr(p2bytestr, pstr);
-               result = hfa384x_drvr_setconfig(
-                       hw, HFA384x_RID_CNFDESIREDSSID,
-                       bytebuf, HFA384x_RID_CNFDESIREDSSID_LEN);
-               if ( result ) {
-                       WLAN_LOG_ERROR("Failed to set SSID\n");
-                       goto failed;
-               }
-
-               /* Enable the Port */
-               result = hfa384x_cmd_enable(hw, 0);
-               if ( result ) {
-                       WLAN_LOG_ERROR("Enable macport failed, result=%d.\n", result);
-                       goto failed;
-               }
-
-               /* Fill in the join request */
-               joinreq.channel = msg->channel.data;
-               memcpy( joinreq.bssid, ((unsigned char *) &msg->bssid.data) + 1, WLAN_BSSID_LEN);
-               hw->joinreq = joinreq;
-               hw->join_ap = 1;
-
-               /* Send the join request */
-               result = hfa384x_drvr_setconfig( hw,
-                       HFA384x_RID_JOINREQUEST,
-                       &joinreq, HFA384x_RID_JOINREQUEST_LEN);
-                if(result != 0) {
-                       WLAN_LOG_ERROR("Join request failed, result=%d.\n", result);
-                       goto failed;
-               }
-
-       } else {
+       wlandev->macmode = WLAN_MACMODE_NONE;
 
-               /*** ACCESS POINT ***/
+       /* Set the PortType */
+       msg->resultcode.status = P80211ENUM_msgitem_status_data_ok;
+       msg->resultcode.data = P80211ENUM_resultcode_success;
 
-               /* Never supported by APs */
-               msg->resultcode.status = P80211ENUM_msgitem_status_data_ok;
-               msg->resultcode.data = P80211ENUM_resultcode_not_supported;
+       /* ess port */
+       result = hfa384x_drvr_setconfig16(hw, HFA384x_RID_CNFPORTTYPE, 1);
+       if ( result ) {
+               WLAN_LOG_ERROR("Failed to set Port Type\n");
+               goto failed;
        }
 
-        goto done;
-failed:
-       WLAN_LOG_DEBUG(1, "Failed to set a config option, result=%d\n", result);
-       msg->resultcode.data = P80211ENUM_resultcode_invalid_parameters;
-
-done:
-        result = 0;
-
-       DBFEXIT;
-       return result;
-}
-
-
-/*----------------------------------------------------------------
-* prism2mgmt_authenticate
-*
-* Station should be begin an authentication exchange.
-*
-* Arguments:
-*      wlandev         wlan device structure
-*      msgp            ptr to msg buffer
-*
-* Returns:
-*      0       success and done
-*      <0      success, but we're waiting for something to finish.
-*      >0      an error occurred while handling the message.
-* Side effects:
-*
-* Call context:
-*      process thread  (usually)
-*      interrupt
-----------------------------------------------------------------*/
-int prism2mgmt_authenticate(wlandevice_t *wlandev, void *msgp)
-{
-       int                     result = 0;
-       hfa384x_t               *hw = wlandev->priv;
-       p80211msg_dot11req_authenticate_t       *msg = msgp;
-       DBFENTER;
-
-       if (!hw->ap) {
-
-               /*** STATION ***/
-
-               /* TODO: Decide how we're going to handle this one w/ Prism2 */
-               /*       It could be entertaining since Prism2 doesn't have  */
-               /*       an explicit way to control this */
-               msg->resultcode.status = P80211ENUM_msgitem_status_data_ok;
-               msg->resultcode.data = P80211ENUM_resultcode_not_supported;
+       /* Set the auth type */
+       if ( msg->authtype.data == P80211ENUM_authalg_sharedkey ) {
+               reg = HFA384x_CNFAUTHENTICATION_SHAREDKEY;
        } else {
-
-               /*** ACCESS POINT ***/
-
-               /* Never supported by APs */
-               msg->resultcode.status = P80211ENUM_msgitem_status_data_ok;
-               msg->resultcode.data = P80211ENUM_resultcode_not_supported;
+               reg = HFA384x_CNFAUTHENTICATION_OPENSYSTEM;
        }
-
-       DBFEXIT;
-       return result;
-}
-
-
-/*----------------------------------------------------------------
-* prism2mgmt_deauthenticate
-*
-* Send a deauthenticate notification.
-*
-* Arguments:
-*      wlandev         wlan device structure
-*      msgp            ptr to msg buffer
-*
-* Returns:
-*      0       success and done
-*      <0      success, but we're waiting for something to finish.
-*      >0      an error occurred while handling the message.
-* Side effects:
-*
-* Call context:
-*      process thread  (usually)
-*      interrupt
-----------------------------------------------------------------*/
-int prism2mgmt_deauthenticate(wlandevice_t *wlandev, void *msgp)
-{
-       int                     result = 0;
-       hfa384x_t               *hw = wlandev->priv;
-       p80211msg_dot11req_deauthenticate_t     *msg = msgp;
-       DBFENTER;
-
-       if (!hw->ap) {
-
-               /*** STATION ***/
-
-               /* TODO: Decide how we're going to handle this one w/ Prism2 */
-               /*       It could be entertaining since Prism2 doesn't have  */
-               /*       an explicit way to control this */
-               msg->resultcode.status = P80211ENUM_msgitem_status_data_ok;
-               msg->resultcode.data = P80211ENUM_resultcode_not_supported;
-       } else {
-
-               /*** ACCESS POINT ***/
-               hfa384x_drvr_handover(hw, msg->peerstaaddress.data.data);
-               msg->resultcode.status = P80211ENUM_msgitem_status_data_ok;
-               msg->resultcode.data = P80211ENUM_resultcode_success;
+       result = hfa384x_drvr_setconfig16(hw, HFA384x_RID_CNFAUTHENTICATION, reg);
+       if ( result ) {
+               WLAN_LOG_ERROR("Failed to set Authentication\n");
+               goto failed;
        }
 
-       DBFEXIT;
-       return result;
-}
-
-
-/*----------------------------------------------------------------
-* prism2mgmt_associate
-*
-* Associate with an ESS.
-*
-* Arguments:
-*      wlandev         wlan device structure
-*      msgp            ptr to msg buffer
-*
-* Returns:
-*      0       success and done
-*      <0      success, but we're waiting for something to finish.
-*      >0      an error occurred while handling the message.
-* Side effects:
-*
-* Call context:
-*      process thread  (usually)
-*      interrupt
-----------------------------------------------------------------*/
-int prism2mgmt_associate(wlandevice_t *wlandev, void *msgp)
-{
-       hfa384x_t               *hw = wlandev->priv;
-       int                     result = 0;
-       p80211msg_dot11req_associate_t  *msg = msgp;
-       DBFENTER;
-
-       if (!hw->ap) {
-
-               /*** STATION ***/
-
-#if 0
-               /* Set the TxRates */
-               reg = 0x000f;
-               hfa384x_drvr_setconfig16(hw, HFA384x_RID_TXRATECNTL, reg);
-#endif
-
-               /* Set the PortType */
-               /* ess port */
-               hfa384x_drvr_setconfig16(hw, HFA384x_RID_CNFPORTTYPE, 1);
-
-               /* Enable the Port */
-               hfa384x_drvr_enable(hw, 0);
-
-               /* Set the resultcode */
-               msg->resultcode.status = P80211ENUM_msgitem_status_data_ok;
-               msg->resultcode.data = P80211ENUM_resultcode_success;
-
-       } else {
+       /* Turn off all roaming */
+       hfa384x_drvr_setconfig16(hw, HFA384x_RID_CNFROAMINGMODE, 3);
+       if ( result ) {
+               WLAN_LOG_ERROR("Failed to Turn off Roaming\n");
+               goto failed;
+       }
 
-               /*** ACCESS POINT ***/
+       /* Basic rates */
+       reg = 0;
+       if ( msg->basicrate1.status == P80211ENUM_msgitem_status_data_ok ) {
+               reg = p80211rate_to_p2bit(msg->basicrate1.data);
+       }
+       if ( msg->basicrate2.status == P80211ENUM_msgitem_status_data_ok ) {
+               reg |= p80211rate_to_p2bit(msg->basicrate2.data);
+       }
+       if ( msg->basicrate3.status == P80211ENUM_msgitem_status_data_ok ) {
+               reg |= p80211rate_to_p2bit(msg->basicrate3.data);
+       }
+       if ( msg->basicrate4.status == P80211ENUM_msgitem_status_data_ok ) {
+               reg |= p80211rate_to_p2bit(msg->basicrate4.data);
+       }
+       if ( msg->basicrate5.status == P80211ENUM_msgitem_status_data_ok ) {
+               reg |= p80211rate_to_p2bit(msg->basicrate5.data);
+       }
+       if ( msg->basicrate6.status == P80211ENUM_msgitem_status_data_ok ) {
+               reg |= p80211rate_to_p2bit(msg->basicrate6.data);
+       }
+       if ( msg->basicrate7.status == P80211ENUM_msgitem_status_data_ok ) {
+               reg |= p80211rate_to_p2bit(msg->basicrate7.data);
+       }
+       if ( msg->basicrate8.status == P80211ENUM_msgitem_status_data_ok ) {
+               reg |= p80211rate_to_p2bit(msg->basicrate8.data);
+       }
+       if( reg == 0)
+               reg = 0x03;
+       result = hfa384x_drvr_setconfig16(hw, HFA384x_RID_CNFBASICRATES, reg);
+       if ( result ) {
+               WLAN_LOG_ERROR("Failed to set basicrates=%d.\n", reg);
+               goto failed;
+       }
 
-               /* Never supported on AP */
-               msg->resultcode.status = P80211ENUM_msgitem_status_data_ok;
-               msg->resultcode.data = P80211ENUM_resultcode_not_supported;
+       /* Operational rates (supprates and txratecontrol) */
+       reg = 0;
+       if ( msg->operationalrate1.status == P80211ENUM_msgitem_status_data_ok ) {
+               reg = p80211rate_to_p2bit(msg->operationalrate1.data);
+       }
+       if ( msg->operationalrate2.status == P80211ENUM_msgitem_status_data_ok ) {
+               reg |= p80211rate_to_p2bit(msg->operationalrate2.data);
+       }
+       if ( msg->operationalrate3.status == P80211ENUM_msgitem_status_data_ok ) {
+               reg |= p80211rate_to_p2bit(msg->operationalrate3.data);
+       }
+       if ( msg->operationalrate4.status == P80211ENUM_msgitem_status_data_ok ) {
+               reg |= p80211rate_to_p2bit(msg->operationalrate4.data);
+       }
+       if ( msg->operationalrate5.status == P80211ENUM_msgitem_status_data_ok ) {
+               reg |= p80211rate_to_p2bit(msg->operationalrate5.data);
+       }
+       if ( msg->operationalrate6.status == P80211ENUM_msgitem_status_data_ok ) {
+               reg |= p80211rate_to_p2bit(msg->operationalrate6.data);
+       }
+       if ( msg->operationalrate7.status == P80211ENUM_msgitem_status_data_ok ) {
+               reg |= p80211rate_to_p2bit(msg->operationalrate7.data);
+       }
+       if ( msg->operationalrate8.status == P80211ENUM_msgitem_status_data_ok ) {
+               reg |= p80211rate_to_p2bit(msg->operationalrate8.data);
+       }
+       if( reg == 0)
+               reg = 0x0f;
+       result = hfa384x_drvr_setconfig16(hw, HFA384x_RID_CNFSUPPRATES, reg);
+       if ( result ) {
+               WLAN_LOG_ERROR("Failed to set supprates=%d.\n", reg);
+               goto failed;
        }
 
-       DBFEXIT;
-       return result;
-}
-
+       result = hfa384x_drvr_setconfig16(hw, HFA384x_RID_TXRATECNTL, reg);
+       if ( result ) {
+               WLAN_LOG_ERROR("Failed to set txrates=%d.\n", reg);
+               goto failed;
+       }
 
-/*----------------------------------------------------------------
-* prism2mgmt_reassociate
-*
-* Renew association because of a BSS change.
-*
-* Arguments:
-*      wlandev         wlan device structure
-*      msgp            ptr to msg buffer
-*
-* Returns:
-*      0       success and done
-*      <0      success, but we're waiting for something to finish.
-*      >0      an error occurred while handling the message.
-* Side effects:
-*
-* Call context:
-*      process thread  (usually)
-*      interrupt
-----------------------------------------------------------------*/
-int prism2mgmt_reassociate(wlandevice_t *wlandev, void *msgp)
-{
-       int                     result = 0;
-       hfa384x_t               *hw = wlandev->priv;
-       p80211msg_dot11req_reassociate_t        *msg = msgp;
-       DBFENTER;
+       /* Set the ssid */
+       memset(bytebuf, 0, 256);
+       pstr = (p80211pstrd_t*)&(msg->ssid.data);
+       prism2mgmt_pstr2bytestr(p2bytestr, pstr);
+       result = hfa384x_drvr_setconfig(
+               hw, HFA384x_RID_CNFDESIREDSSID,
+               bytebuf, HFA384x_RID_CNFDESIREDSSID_LEN);
+       if ( result ) {
+               WLAN_LOG_ERROR("Failed to set SSID\n");
+               goto failed;
+       }
 
-       if (!hw->ap) {
+       /* Enable the Port */
+       result = hfa384x_cmd_enable(hw, 0);
+       if ( result ) {
+               WLAN_LOG_ERROR("Enable macport failed, result=%d.\n", result);
+               goto failed;
+       }
 
-               /*** STATION ***/
+       /* Fill in the join request */
+       joinreq.channel = msg->channel.data;
+       memcpy( joinreq.bssid, ((unsigned char *) &msg->bssid.data) + 1, WLAN_BSSID_LEN);
+       hw->joinreq = joinreq;
+       hw->join_ap = 1;
 
-               /* TODO: Not supported yet...not sure how we're going to do it */
-               msg->resultcode.status = P80211ENUM_msgitem_status_data_ok;
-               msg->resultcode.data = P80211ENUM_resultcode_not_supported;
-       } else {
+       /* Send the join request */
+       result = hfa384x_drvr_setconfig( hw,
+                                        HFA384x_RID_JOINREQUEST,
+                                        &joinreq, HFA384x_RID_JOINREQUEST_LEN);
+       if(result != 0) {
+               WLAN_LOG_ERROR("Join request failed, result=%d.\n", result);
+               goto failed;
+       }
 
-               /*** ACCESS POINT ***/
+        goto done;
+failed:
+       WLAN_LOG_DEBUG(1, "Failed to set a config option, result=%d\n", result);
+       msg->resultcode.data = P80211ENUM_resultcode_invalid_parameters;
 
-               /* Never supported on AP */
-               msg->resultcode.status = P80211ENUM_msgitem_status_data_ok;
-               msg->resultcode.data = P80211ENUM_resultcode_not_supported;
-       }
+done:
+        result = 0;
 
        DBFEXIT;
        return result;
 }
 
-
 /*----------------------------------------------------------------
-* prism2mgmt_disassociate
+* prism2mgmt_associate
 *
-* Send a disassociation notification.
+* Associate with an ESS.
 *
 * Arguments:
 *      wlandev         wlan device structure
@@ -1069,33 +712,34 @@ int prism2mgmt_reassociate(wlandevice_t *wlandev, void *msgp)
 *      process thread  (usually)
 *      interrupt
 ----------------------------------------------------------------*/
-int prism2mgmt_disassociate(wlandevice_t *wlandev, void *msgp)
+int prism2mgmt_associate(wlandevice_t *wlandev, void *msgp)
 {
-       int                     result = 0;
        hfa384x_t               *hw = wlandev->priv;
-       p80211msg_dot11req_disassociate_t       *msg = msgp;
+       int                     result = 0;
+       p80211msg_dot11req_associate_t  *msg = msgp;
        DBFENTER;
 
-       if (!hw->ap) {
+#if 0
+       /* Set the TxRates */
+       reg = 0x000f;
+       hfa384x_drvr_setconfig16(hw, HFA384x_RID_TXRATECNTL, reg);
+#endif
 
-               /*** STATION ***/
+       /* Set the PortType */
+       /* ess port */
+       hfa384x_drvr_setconfig16(hw, HFA384x_RID_CNFPORTTYPE, 1);
 
-               /* TODO: Not supported yet...not sure how to do it */
-               msg->resultcode.status = P80211ENUM_msgitem_status_data_ok;
-               msg->resultcode.data = P80211ENUM_resultcode_not_supported;
-       } else {
+       /* Enable the Port */
+       hfa384x_drvr_enable(hw, 0);
 
-               /*** ACCESS POINT ***/
-               hfa384x_drvr_handover(hw, msg->peerstaaddress.data.data);
-               msg->resultcode.status = P80211ENUM_msgitem_status_data_ok;
-               msg->resultcode.data = P80211ENUM_resultcode_success;
-       }
+       /* Set the resultcode */
+       msg->resultcode.status = P80211ENUM_msgitem_status_data_ok;
+       msg->resultcode.data = P80211ENUM_resultcode_success;
 
        DBFEXIT;
        return result;
 }
 
-
 /*----------------------------------------------------------------
 * prism2mgmt_reset
 *
@@ -1189,7 +833,6 @@ int prism2mgmt_start(wlandevice_t *wlandev, void *msgp)
        p80211pstrd_t           *pstr;
        UINT8                   bytebuf[80];
        hfa384x_bytestr_t       *p2bytestr = (hfa384x_bytestr_t*)bytebuf;
-       hfa384x_PCFInfo_data_t  *pcfinfo = (hfa384x_PCFInfo_data_t*)bytebuf;
        UINT16                  word;
        DBFENTER;
 
@@ -1198,166 +841,41 @@ int prism2mgmt_start(wlandevice_t *wlandev, void *msgp)
        /* Set the SSID */
        memcpy(&wlandev->ssid, &msg->ssid.data, sizeof(msg->ssid.data));
 
-       if (!hw->ap) {
-               /*** ADHOC IBSS ***/
-               /* see if current f/w is less than 8c3 */
-               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)) {
-                       /* Ad-Hoc not quite supported on Prism2 */
-                       msg->resultcode.status = P80211ENUM_msgitem_status_data_ok;
-                       msg->resultcode.data = P80211ENUM_resultcode_not_supported;
-                       goto done;
-               }
-
-               msg->resultcode.status = P80211ENUM_msgitem_status_data_ok;
-
-               /*** STATION ***/
-               /* Set the REQUIRED config items */
-               /* SSID */
-               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");
-                       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");
-                       goto failed;
-               }
-
-               /* bsstype - we use the default in the ap firmware */
-               /* IBSS port */
-               hfa384x_drvr_setconfig16(hw, HFA384x_RID_CNFPORTTYPE, 0);
-
-               /* 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);
-                       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);
-                       goto failed;
-               }
-               /* Basic rates */
-               word = p80211rate_to_p2bit(msg->basicrate1.data);
-               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 ) {
-                       word |= p80211rate_to_p2bit(msg->basicrate3.data);
-               }
-               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 ) {
-                       word |= p80211rate_to_p2bit(msg->basicrate5.data);
-               }
-               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 ) {
-                       word |= p80211rate_to_p2bit(msg->basicrate7.data);
-               }
-               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);
-                       goto failed;
-               }
-
-               /* Operational rates (supprates and txratecontrol) */
-               word = p80211rate_to_p2bit(msg->operationalrate1.data);
-               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 ) {
-                       word |= p80211rate_to_p2bit(msg->operationalrate3.data);
-               }
-               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 ) {
-                       word |= p80211rate_to_p2bit(msg->operationalrate5.data);
-               }
-               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 ) {
-                       word |= p80211rate_to_p2bit(msg->operationalrate7.data);
-               }
-               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);
-                       goto failed;
-               }
-
-               result = hfa384x_drvr_setconfig16(hw, HFA384x_RID_TXRATECNTL, word);
-               if ( result ) {
-                       WLAN_LOG_ERROR("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 ) {
-                       wlandev->macmode = WLAN_MACMODE_IBSS_STA;
-                       /* lets extend the data length a bit */
-                       hfa384x_drvr_setconfig16(hw, HFA384x_RID_CNFMAXDATALEN, 2304);
-               }
-
-               /* Enable the Port */
-               result = hfa384x_drvr_enable(hw, 0);
-               if ( result ) {
-                       WLAN_LOG_ERROR("Enable macport failed, result=%d.\n", result);
-                       goto failed;
-               }
-
-               msg->resultcode.data = P80211ENUM_resultcode_success;
-
+       /*** ADHOC IBSS ***/
+       /* see if current f/w is less than 8c3 */
+       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)) {
+               /* Ad-Hoc not quite supported on Prism2 */
+               msg->resultcode.status = P80211ENUM_msgitem_status_data_ok;
+               msg->resultcode.data = P80211ENUM_resultcode_not_supported;
                goto done;
        }
 
-       /*** ACCESS POINT ***/
-
        msg->resultcode.status = P80211ENUM_msgitem_status_data_ok;
 
-       /* Validate the command, if BSStype=infra is the tertiary loaded? */
-       if ( msg->bsstype.data == P80211ENUM_bsstype_independent ) {
-               WLAN_LOG_ERROR("AP driver cannot create IBSS.\n");
-               goto failed;
-       } else if ( hw->cap_sup_sta.id != 5) {
-               WLAN_LOG_ERROR("AP driver failed to detect AP firmware.\n");
-               goto failed;
-       }
-
+       /*** STATION ***/
        /* Set the REQUIRED config items */
        /* SSID */
        pstr = (p80211pstrd_t*)&(msg->ssid.data);
        prism2mgmt_pstr2bytestr(p2bytestr, pstr);
        result = hfa384x_drvr_setconfig( hw, HFA384x_RID_CNFOWNSSID,
-                               bytebuf, HFA384x_RID_CNFOWNSSID_LEN);
+                                        bytebuf, HFA384x_RID_CNFOWNSSID_LEN);
        if ( result ) {
-               WLAN_LOG_ERROR("Failed to set SSID, result=0x%04x\n", result);
+               WLAN_LOG_ERROR("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");
                goto failed;
        }
 
        /* bsstype - we use the default in the ap firmware */
+       /* IBSS port */
+       hfa384x_drvr_setconfig16(hw, HFA384x_RID_CNFPORTTYPE, 0);
 
        /* beacon period */
        word = msg->beaconperiod.data;
@@ -1431,98 +949,20 @@ int prism2mgmt_start(wlandevice_t *wlandev, void *msgp)
                WLAN_LOG_ERROR("Failed to set supprates=%d.\n", word);
                goto failed;
        }
-       result = hfa384x_drvr_setconfig16(hw, HFA384x_RID_TXRATECNTL0, word);
-       if ( result ) {
-               WLAN_LOG_ERROR("Failed to set txrates=%d.\n", word);
-               goto failed;
-       }
-
-       /* ibssatimwindow */
-       if (msg->ibssatimwindow.status == P80211ENUM_msgitem_status_data_ok) {
-               WLAN_LOG_INFO("prism2mgmt_start: atimwindow not used in "
-                              "Infrastructure mode, ignored.\n");
-       }
-
-       /* DTIM period */
-       word = msg->dtimperiod.data;
-       result = hfa384x_drvr_setconfig16(hw, HFA384x_RID_CNFOWNDTIMPER, word);
-       if ( result ) {
-               WLAN_LOG_ERROR("Failed to set dtim period=%d.\n", word);
-               goto failed;
-       }
-
-       /* probedelay */
-       if (msg->probedelay.status == P80211ENUM_msgitem_status_data_ok) {
-               WLAN_LOG_INFO("prism2mgmt_start: probedelay not "
-                              "supported in prism2, ignored.\n");
-       }
-
-       /* cfpollable, cfpollreq, cfpperiod, cfpmaxduration */
-       if (msg->cfpollable.data == P80211ENUM_truth_true &&
-           msg->cfpollreq.data == P80211ENUM_truth_true ) {
-               WLAN_LOG_ERROR("cfpollable=cfpollreq=true is illegal.\n");
-               result = -1;
-               goto failed;
-       }
-
-       /* read the PCFInfo and update */
-       result = hfa384x_drvr_getconfig(hw, HFA384x_RID_CNFAPPCFINFO,
-                                       pcfinfo, HFA384x_RID_CNFAPPCFINFO_LEN);
-       if ( result ) {
-               WLAN_LOG_INFO("prism2mgmt_start: read(pcfinfo) failed, "
-                               "assume it's "
-                               "not supported, pcf settings ignored.\n");
-               goto pcf_skip;
-       }
-       if ((msg->cfpollable.data == P80211ENUM_truth_false &&
-            msg->cfpollreq.data == P80211ENUM_truth_false) ) {
-               pcfinfo->MediumOccupancyLimit = 0;
-               pcfinfo->CFPPeriod = 0;
-               pcfinfo->CFPMaxDuration = 0;
-               pcfinfo->CFPFlags &= host2hfa384x_16((UINT16)~BIT0);
-
-               if ( msg->cfpperiod.status == P80211ENUM_msgitem_status_data_ok ||
-                    msg->cfpmaxduration.status == P80211ENUM_msgitem_status_data_ok ) {
-                       WLAN_LOG_WARNING(
-                               "Setting cfpperiod or cfpmaxduration when "
-                               "cfpollable and cfreq are false is pointless.\n");
-               }
-       }
-       if ((msg->cfpollable.data == P80211ENUM_truth_true ||
-            msg->cfpollreq.data == P80211ENUM_truth_true) ) {
-               if ( msg->cfpollable.data == P80211ENUM_truth_true) {
-                       pcfinfo->CFPFlags |= host2hfa384x_16((UINT16)BIT0);
-               }
-
-               if ( msg->cfpperiod.status == P80211ENUM_msgitem_status_data_ok) {
-                       pcfinfo->CFPPeriod = msg->cfpperiod.data;
-                       pcfinfo->CFPPeriod = host2hfa384x_16(pcfinfo->CFPPeriod);
-               }
 
-               if ( msg->cfpmaxduration.status == P80211ENUM_msgitem_status_data_ok) {
-                       pcfinfo->CFPMaxDuration = msg->cfpmaxduration.data;
-                       pcfinfo->CFPMaxDuration = host2hfa384x_16(pcfinfo->CFPMaxDuration);
-                       pcfinfo->MediumOccupancyLimit = pcfinfo->CFPMaxDuration;
-               }
-       }
-       result = hfa384x_drvr_setconfig(hw, HFA384x_RID_CNFAPPCFINFO,
-                                       pcfinfo, HFA384x_RID_CNFAPPCFINFO_LEN);
+       result = hfa384x_drvr_setconfig16(hw, HFA384x_RID_TXRATECNTL, word);
        if ( result ) {
-               WLAN_LOG_ERROR("write(pcfinfo) failed.\n");
+               WLAN_LOG_ERROR("Failed to set txrates=%d.\n", word);
                goto failed;
        }
 
-pcf_skip:
        /* Set the macmode so the frame setup code knows what to do */
-       if ( msg->bsstype.data == P80211ENUM_bsstype_infrastructure ) {
-               wlandev->macmode = WLAN_MACMODE_ESS_AP;
+       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);
        }
 
-       /* Set the BSSID to the same as our MAC */
-       memcpy( wlandev->bssid, wlandev->netdev->dev_addr, WLAN_BSSID_LEN);
-
        /* Enable the Port */
        result = hfa384x_drvr_enable(hw, 0);
        if ( result ) {
@@ -1544,80 +984,6 @@ done:
        return result;
 }
 
-
-/*----------------------------------------------------------------
-* prism2mgmt_enable
-*
-* Start a BSS.  Any station can do this for IBSS, only AP for ESS.
-*
-* Arguments:
-*      wlandev         wlan device structure
-*      msgp            ptr to msg buffer
-*
-* Returns:
-*      0       success and done
-*      <0      success, but we're waiting for something to finish.
-*      >0      an error occurred while handling the message.
-* Side effects:
-*
-* Call context:
-*      process thread  (usually)
-*      interrupt
-----------------------------------------------------------------*/
-int prism2mgmt_enable(wlandevice_t *wlandev, void *msgp)
-{
-       int                     result = 0;
-       hfa384x_t               *hw = wlandev->priv;
-       p80211msg_p2req_enable_t        *msg = msgp;
-       DBFENTER;
-
-       if (!hw->ap) {
-
-               /*** STATION ***/
-
-               /* Ad-Hoc not quite supported on Prism2 */
-               msg->resultcode.status = P80211ENUM_msgitem_status_data_ok;
-               msg->resultcode.data = P80211ENUM_resultcode_not_supported;
-               goto done;
-       }
-
-       /*** ACCESS POINT ***/
-
-       msg->resultcode.status = P80211ENUM_msgitem_status_data_ok;
-
-       /* Is the tertiary loaded? */
-       if ( hw->cap_sup_sta.id != 5) {
-               WLAN_LOG_ERROR("AP driver failed to detect AP firmware.\n");
-               goto failed;
-       }
-
-       /* Set the macmode so the frame setup code knows what to do */
-       wlandev->macmode = WLAN_MACMODE_ESS_AP;
-
-       /* Set the BSSID to the same as our MAC */
-       memcpy( wlandev->bssid, wlandev->netdev->dev_addr, WLAN_BSSID_LEN);
-
-       /* Enable the Port */
-       result = hfa384x_drvr_enable(hw, 0);
-       if ( result ) {
-               WLAN_LOG_ERROR("Enable macport failed, result=%d.\n", result);
-               goto failed;
-       }
-
-       msg->resultcode.data = P80211ENUM_resultcode_success;
-
-       goto done;
-failed:
-       msg->resultcode.data = P80211ENUM_resultcode_invalid_parameters;
-
-done:
-       result = 0;
-
-       DBFEXIT;
-       return result;
-}
-
-
 /*----------------------------------------------------------------
 * prism2mgmt_readpda
 *
@@ -2341,16 +1707,6 @@ int prism2mgmt_autojoin(wlandevice_t *wlandev, void *msgp)
        /* Set the SSID */
        memcpy(&wlandev->ssid, &msg->ssid.data, sizeof(msg->ssid.data));
 
-       if (hw->ap) {
-
-               /*** ACCESS POINT ***/
-
-               /* Never supported on AP */
-               msg->resultcode.status = P80211ENUM_msgitem_status_data_ok;
-               msg->resultcode.data = P80211ENUM_resultcode_not_supported;
-               goto done;
-       }
-
        /* Disable the Port */
        hfa384x_drvr_disable(hw, 0);
 
@@ -2402,7 +1758,6 @@ int prism2mgmt_autojoin(wlandevice_t *wlandev, void *msgp)
        msg->resultcode.status = P80211ENUM_msgitem_status_data_ok;
        msg->resultcode.data = P80211ENUM_resultcode_success;
 
-done:
        DBFEXIT;
        return result;
 }
index 436427cabfe6598034558d1593851b3c9554c92c..c214a6484f977c08c0c60510ca53b8aa23708c3e 100644 (file)
@@ -100,16 +100,10 @@ prism2sta_ev_alloc(wlandevice_t *wlandev);
 
 
 int prism2mgmt_mibset_mibget(wlandevice_t *wlandev, void *msgp);
-int prism2mgmt_powermgmt(wlandevice_t *wlandev, void *msgp);
 int prism2mgmt_scan(wlandevice_t *wlandev, void *msgp);
 int prism2mgmt_scan_results(wlandevice_t *wlandev, void *msgp);
-int prism2mgmt_join(wlandevice_t *wlandev, void *msgp);
 int prism2mgmt_p2_join(wlandevice_t *wlandev, void *msgp);
-int prism2mgmt_authenticate(wlandevice_t *wlandev, void *msgp);
-int prism2mgmt_deauthenticate(wlandevice_t *wlandev, void *msgp);
 int prism2mgmt_associate(wlandevice_t *wlandev, void *msgp);
-int prism2mgmt_reassociate(wlandevice_t *wlandev, void *msgp);
-int prism2mgmt_disassociate(wlandevice_t *wlandev, void *msgp);
 int prism2mgmt_reset(wlandevice_t *wlandev, void *msgp);
 int prism2mgmt_start(wlandevice_t *wlandev, void *msgp);
 int prism2mgmt_wlansniff(wlandevice_t *wlandev, void *msgp);
@@ -128,7 +122,6 @@ int prism2mgmt_flashdl_state(wlandevice_t *wlandev, void *msgp);
 int prism2mgmt_flashdl_write(wlandevice_t *wlandev, void *msgp);
 int prism2mgmt_mm_state(wlandevice_t *wlandev, void *msgp);
 int prism2mgmt_dump_state(wlandevice_t *wlandev, void *msgp);
-int prism2mgmt_enable(wlandevice_t *wlandev, void *msgp);
 int prism2mgmt_autojoin(wlandevice_t *wlandev, void *msgp);
 
 /*---------------------------------------------------------------
index 4d104a85cd8aacaa2269cbeb0ee32b47947a570e..8ce1ee970b88030874fd385709f1ebb0fd204c48 100644 (file)
@@ -390,10 +390,6 @@ static int prism2sta_mlmerequest(wlandevice_t *wlandev, p80211msg_t *msg)
                WLAN_LOG_DEBUG(2,"Received mibset request\n");
                result = prism2mgmt_mibset_mibget(wlandev, msg);
                break;
-       case DIDmsg_dot11req_powermgmt :
-               WLAN_LOG_DEBUG(2,"Received powermgmt request\n");
-               result = prism2mgmt_powermgmt(wlandev, msg);
-               break;
        case DIDmsg_dot11req_scan :
                WLAN_LOG_DEBUG(2,"Received scan request\n");
                result = prism2mgmt_scan(wlandev, msg);
@@ -402,30 +398,10 @@ static int prism2sta_mlmerequest(wlandevice_t *wlandev, p80211msg_t *msg)
                WLAN_LOG_DEBUG(2,"Received scan_results request\n");
                result = prism2mgmt_scan_results(wlandev, msg);
                break;
-       case DIDmsg_dot11req_join :
-               WLAN_LOG_DEBUG(2,"Received join request\n");
-               result = prism2mgmt_join(wlandev, msg);
-               break;
-       case DIDmsg_dot11req_authenticate :
-               WLAN_LOG_DEBUG(2,"Received authenticate request\n");
-               result = prism2mgmt_authenticate(wlandev, msg);
-               break;
-       case DIDmsg_dot11req_deauthenticate :
-               WLAN_LOG_DEBUG(2,"Received mlme deauthenticate request\n");
-               result = prism2mgmt_deauthenticate(wlandev, msg);
-               break;
        case DIDmsg_dot11req_associate :
                WLAN_LOG_DEBUG(2,"Received mlme associate request\n");
                result = prism2mgmt_associate(wlandev, msg);
                break;
-       case DIDmsg_dot11req_reassociate :
-               WLAN_LOG_DEBUG(2,"Received mlme reassociate request\n");
-               result = prism2mgmt_reassociate(wlandev, msg);
-               break;
-       case DIDmsg_dot11req_disassociate :
-               WLAN_LOG_DEBUG(2,"Received mlme disassociate request\n");
-               result = prism2mgmt_disassociate(wlandev, msg);
-               break;
        case DIDmsg_dot11req_reset :
                WLAN_LOG_DEBUG(2,"Received mlme reset request\n");
                result = prism2mgmt_reset(wlandev, msg);
@@ -522,18 +498,11 @@ static int prism2sta_mlmerequest(wlandevice_t *wlandev, p80211msg_t *msg)
                WLAN_LOG_DEBUG(2,"Received mlme autojoin request\n");
                result = prism2mgmt_autojoin(wlandev, msg);
                break;
-       case DIDmsg_p2req_enable :
-               WLAN_LOG_DEBUG(2,"Received mlme enable request\n");
-               result = prism2mgmt_enable(wlandev, msg);
-               break;
        case DIDmsg_lnxreq_commsquality: {
                p80211msg_lnxreq_commsquality_t *qualmsg;
 
                WLAN_LOG_DEBUG(2,"Received commsquality request\n");
 
-               if (hw->ap)
-                       break;
-
                qualmsg = (p80211msg_lnxreq_commsquality_t*) msg;
 
                qualmsg->link.status = P80211ENUM_msgitem_status_data_ok;
@@ -825,17 +794,17 @@ static int prism2sta_getcardinfo(wlandevice_t *wlandev)
        hw->ident_sta_fw.variant &= ~((UINT16)(BIT14 | BIT15));
 
        if  ( hw->ident_sta_fw.id == 0x1f ) {
-               hw->ap = 0;
                WLAN_LOG_INFO(
                        "ident: sta f/w: id=0x%02x %d.%d.%d\n",
                        hw->ident_sta_fw.id, hw->ident_sta_fw.major,
                        hw->ident_sta_fw.minor, hw->ident_sta_fw.variant);
        } else {
-               hw->ap = 1;
                WLAN_LOG_INFO(
                        "ident:  ap f/w: id=0x%02x %d.%d.%d\n",
                        hw->ident_sta_fw.id, hw->ident_sta_fw.major,
                        hw->ident_sta_fw.minor, hw->ident_sta_fw.variant);
+               WLAN_LOG_ERROR("Unsupported Tertiary AP firmeare loaded!\n");
+               goto failed;
        }
 
        /* Compatibility range, Modem supplier */
@@ -1091,10 +1060,6 @@ static int prism2sta_setmulticast(wlandevice_t *wlandev, netdevice_t *dev)
        if ( hw->state != HFA384x_STATE_RUNNING )
                goto exit;
 
-       /* If we're an AP, do nothing here */
-       if (hw->ap)
-               goto exit;
-
        if ( (dev->flags & (IFF_PROMISC | IFF_ALLMULTI)) != 0 )
                promisc = P80211ENUM_truth_true;
        else