Skip to content

Commit

Permalink
Staging: wlan-ng: Remove AP-only code from MLME functions.
Browse files Browse the repository at this point in the history 
It is not needed in this driver.

Signed-off-by: Solomon Peachy <pizza@shaftnet.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Solomon Peachy authored and Greg Kroah-Hartman committed Jan 6, 2009
1 parent f980c17 commit 5db8dcc
Show file tree
Hide file tree
Showing 6 changed files with 173 additions and 1,140 deletions.
1 change: 0 additions & 1 deletion drivers/staging/wlan-ng/hfa384x.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
185 changes: 0 additions & 185 deletions drivers/staging/wlan-ng/p80211metadef.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,25 +72,6 @@
(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))
Expand Down Expand Up @@ -301,119 +282,6 @@
(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))
Expand Down Expand Up @@ -445,52 +313,6 @@
(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))
Expand Down Expand Up @@ -1189,13 +1011,6 @@
(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 \
Expand Down
94 changes: 0 additions & 94 deletions drivers/staging/wlan-ng/p80211metastruct.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 ;
Expand Down Expand Up @@ -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 ;
Expand All @@ -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
{
Expand Down Expand Up @@ -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
Loading

0 comments on commit 5db8dcc

Please sign in to comment.