Commit 731a617a authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz Committed by Greg Kroah-Hartman
Browse files

Staging: rt2860: remove dead APCLI_SUPPORT code 



Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 81da7b6d

drivers/staging/rt2860/common/mlme.c

+0 −3
Original line number Diff line number Diff line
@@ -563,9 +563,6 @@ VOID MlmeHandler( 
	IN PRTMP_ADAPTER pAd)

{

	MLME_QUEUE_ELEM 	   *Elem = NULL;

#ifdef APCLI_SUPPORT

	SHORT apcliIfIndex;

#endif



	// Only accept MLME and Frame from peer side, no other (control/data) frame should

	// get into this state machine

drivers/staging/rt2860/common/netif_block.c

+0 −8
Original line number Diff line number Diff line
@@ -95,14 +95,6 @@ VOID StopNetIfQueue( 
	UCHAR IfIdx = 0;

	BOOLEAN valid = FALSE;



#ifdef APCLI_SUPPORT

	if (RTMP_GET_PACKET_NET_DEVICE(pPacket) >= MIN_NET_DEVICE_FOR_APCLI)

	{

		IfIdx = (RTMP_GET_PACKET_NET_DEVICE(pPacket) - MIN_NET_DEVICE_FOR_APCLI) % MAX_APCLI_NUM;

		NetDev = pAd->ApCfg.ApCliTab[IfIdx].dev;

	}

	else

#endif // APCLI_SUPPORT //

	{

#ifdef MBSS_SUPPORT

		if (pAd->OpMode == OPMODE_AP)

drivers/staging/rt2860/rtmp_def.h

+0 −77
Original line number Diff line number Diff line
@@ -330,10 +330,6 @@ 
#define MAX_MESH_NUM				0



#define MAX_APCLI_NUM				0

#ifdef APCLI_SUPPORT

#undef	MAX_APCLI_NUM

#define MAX_APCLI_NUM				1

#endif // APCLI_SUPPORT //



#define MAX_MBSSID_NUM				1

#ifdef MBSS_SUPPORT
@@ -948,79 +944,6 @@ 


#define AP_WPA_FUNC_SIZE                (AP_MAX_WPA_PTK_STATE * AP_MAX_WPA_MSG)



#ifdef APCLI_SUPPORT

//ApCli authentication state machine

#define APCLI_AUTH_REQ_IDLE                0

#define APCLI_AUTH_WAIT_SEQ2               1

#define APCLI_AUTH_WAIT_SEQ4               2

#define APCLI_MAX_AUTH_STATE               3



#define APCLI_AUTH_MACHINE_BASE            0

#define APCLI_MT2_MLME_AUTH_REQ            0

#define APCLI_MT2_MLME_DEAUTH_REQ          1

#define APCLI_MT2_PEER_AUTH_EVEN           2

#define APCLI_MT2_PEER_DEAUTH              3

#define APCLI_MT2_AUTH_TIMEOUT             4

#define APCLI_MAX_AUTH_MSG                 5



#define APCLI_AUTH_FUNC_SIZE               (APCLI_MAX_AUTH_STATE * APCLI_MAX_AUTH_MSG)



//ApCli association state machine

#define APCLI_ASSOC_IDLE                   0

#define APCLI_ASSOC_WAIT_RSP               1

#define APCLI_MAX_ASSOC_STATE              2



#define APCLI_ASSOC_MACHINE_BASE           0

#define APCLI_MT2_MLME_ASSOC_REQ           0

#define APCLI_MT2_MLME_DISASSOC_REQ        1

#define APCLI_MT2_PEER_DISASSOC_REQ        2

#define APCLI_MT2_PEER_ASSOC_RSP           3

#define APCLI_MT2_ASSOC_TIMEOUT            4

#define APCLI_MAX_ASSOC_MSG                5



#define APCLI_ASSOC_FUNC_SIZE              (APCLI_MAX_ASSOC_STATE * APCLI_MAX_ASSOC_MSG)



//ApCli sync state machine

#define APCLI_SYNC_IDLE                   0  // merge NO_BSS,IBSS_IDLE,IBSS_ACTIVE and BSS in to 1 state

#define APCLI_JOIN_WAIT_PROBE_RSP         1

#define APCLI_MAX_SYNC_STATE              2



#define APCLI_SYNC_MACHINE_BASE           0

#define APCLI_MT2_MLME_PROBE_REQ          0

#define APCLI_MT2_PEER_PROBE_RSP          1

#define APCLI_MT2_PROBE_TIMEOUT           2

#define APCLI_MAX_SYNC_MSG                3



#define APCLI_SYNC_FUNC_SIZE              (APCLI_MAX_SYNC_STATE * APCLI_MAX_SYNC_MSG)



//ApCli ctrl state machine

#define APCLI_CTRL_DISCONNECTED           0  // merge NO_BSS,IBSS_IDLE,IBSS_ACTIVE and BSS in to 1 state

#define APCLI_CTRL_PROBE                  1

#define APCLI_CTRL_AUTH                   2

#define APCLI_CTRL_AUTH_2                 3

#define APCLI_CTRL_ASSOC                  4

#define APCLI_CTRL_DEASSOC                5

#define APCLI_CTRL_CONNECTED              6

#define APCLI_MAX_CTRL_STATE              7



#define APCLI_CTRL_MACHINE_BASE           0

#define APCLI_CTRL_JOIN_REQ               0

#define APCLI_CTRL_PROBE_RSP              1

#define APCLI_CTRL_AUTH_RSP               2

#define APCLI_CTRL_DISCONNECT_REQ         3

#define APCLI_CTRL_PEER_DISCONNECT_REQ    4

#define APCLI_CTRL_ASSOC_RSP              5

#define APCLI_CTRL_DEASSOC_RSP            6

#define APCLI_CTRL_JOIN_REQ_TIMEOUT       7

#define APCLI_CTRL_AUTH_REQ_TIMEOUT       8

#define APCLI_CTRL_ASSOC_REQ_TIMEOUT      9

#define APCLI_MAX_CTRL_MSG                10



#define APCLI_CTRL_FUNC_SIZE              (APCLI_MAX_CTRL_STATE * APCLI_MAX_CTRL_MSG)



#endif	// APCLI_SUPPORT //





// =============================================================================



// value domain of 802.11 header FC.Tyte, which is b3..b2 of the 1st-byte of MAC header