Commit 5db8dcc9 authored by Solomon Peachy's avatar Solomon Peachy Committed by Greg Kroah-Hartman
Browse files

Staging: wlan-ng: Remove AP-only code from MLME functions. 



It is not needed in this driver.

Signed-off-by: default avatarSolomon Peachy <pizza@shaftnet.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent f980c178

drivers/staging/wlan-ng/hfa384x.h

+0 −1
Original line number Diff line number Diff line
@@ -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;

drivers/staging/wlan-ng/p80211metadef.h

+0 −185
Original line number Diff line number Diff line
@@ -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))
@@ -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))
@@ -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))
@@ -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 \

drivers/staging/wlan-ng/p80211metastruct.h

+0 −94
Original line number Diff line number Diff line
@@ -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

drivers/staging/wlan-ng/prism2mgmt.c

+171 −816

File changed.

Preview size limit exceeded, changes collapsed.

drivers/staging/wlan-ng/prism2mgmt.h

+0 −7
Original line number Diff line number Diff line
@@ -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);



/*---------------------------------------------------------------