staging: vt6655: Remove unnecessary blank lines (96d69e20) · Commits · e / devices / android_kernel_oneplus_sm7250

drivers/staging/vt6655/80211hdr.h

+0 −27

Original line number	Diff line number	Diff line
		@@ -86,7 +86,6 @@
		#define WLAN_DATA_MAXLEN 2312
		#define WLAN_A3FR_MAXLEN (WLAN_HDR_ADDR3_LEN + WLAN_DATA_MAXLEN + WLAN_CRC_LEN)


		#define WLAN_BEACON_FR_MAXLEN WLAN_A3FR_MAXLEN
		#define WLAN_ATIM_FR_MAXLEN (WLAN_HDR_ADDR3_LEN + 0)
		#define WLAN_NULLDATA_FR_MAXLEN (WLAN_HDR_ADDR3_LEN + 0)
		@@ -100,7 +99,6 @@
		#define WLAN_AUTHEN_FR_MAXLEN WLAN_A3FR_MAXLEN
		#define WLAN_DEAUTHEN_FR_MAXLEN (WLAN_HDR_ADDR3_LEN + 2)


		#define WLAN_WEP_NKEYS 4
		#define WLAN_WEP40_KEYLEN 5
		#define WLAN_WEP104_KEYLEN 13
		@@ -122,7 +120,6 @@
		#define WLAN_FTYPE_CTL 0x01
		#define WLAN_FTYPE_DATA 0x02


		/* Frame Subtypes */
		#define WLAN_FSTYPE_ASSOCREQ 0x00
		#define WLAN_FSTYPE_ASSOCRESP 0x01
		@@ -155,7 +152,6 @@
		#define WLAN_FSTYPE_CFPOLL 0x06
		#define WLAN_FSTYPE_CFACK_CFPOLL 0x07


		#ifdef __BIG_ENDIAN

		/* GET & SET Frame Control bit */
		@@ -175,7 +171,6 @@
		#define WLAN_GET_SEQ_FRGNUM(n) (((unsigned short)(n) >> 8) & (BIT0\|BIT1\|BIT2\|BIT3))
		#define WLAN_GET_SEQ_SEQNUM(n) ((((unsigned short)(n) >> 8) & (~(BIT0\|BIT1\|BIT2\|BIT3))) >> 4)


		/* Capability Field bit */
		#define WLAN_GET_CAP_INFO_ESS(n) (((n) >> 8) & BIT0)
		#define WLAN_GET_CAP_INFO_IBSS(n) ((((n) >> 8) & BIT1) >> 1)
		@@ -190,7 +185,6 @@
		#define WLAN_GET_CAP_INFO_DSSSOFDM(n) ((((n)) & BIT13) >> 13)
		#define WLAN_GET_CAP_INFO_GRPACK(n) ((((n)) & BIT14) >> 14)


		#else

		/* GET & SET Frame Control bit */
		@@ -206,12 +200,10 @@
		#define WLAN_GET_FC_ISWEP(n) ((((unsigned short)(n)) & (BIT14)) >> 14)
		#define WLAN_GET_FC_ORDER(n) ((((unsigned short)(n)) & (BIT15)) >> 15)


		/* Sequence Field bit */
		#define WLAN_GET_SEQ_FRGNUM(n) (((unsigned short)(n)) & (BIT0\|BIT1\|BIT2\|BIT3))
		#define WLAN_GET_SEQ_SEQNUM(n) ((((unsigned short)(n)) & (~(BIT0\|BIT1\|BIT2\|BIT3))) >> 4)


		/* Capability Field bit */
		#define WLAN_GET_CAP_INFO_ESS(n) ((n) & BIT0)
		#define WLAN_GET_CAP_INFO_IBSS(n) (((n) & BIT1) >> 1)
		@@ -226,10 +218,8 @@
		#define WLAN_GET_CAP_INFO_DSSSOFDM(n) (((n) & BIT13) >> 13)
		#define WLAN_GET_CAP_INFO_GRPACK(n) (((n) & BIT14) >> 14)


		#endif /#ifdef __BIG_ENDIAN /


		#define WLAN_SET_CAP_INFO_ESS(n) (n)
		#define WLAN_SET_CAP_INFO_IBSS(n) ((n) << 1)
		#define WLAN_SET_CAP_INFO_CFPOLLABLE(n) ((n) << 2)
		@@ -243,7 +233,6 @@
		#define WLAN_SET_CAP_INFO_DSSSOFDM(n) ((n) << 13)
		#define WLAN_SET_CAP_INFO_GRPACK(n) ((n) << 14)


		#define WLAN_SET_FC_PRVER(n) ((unsigned short)(n))
		#define WLAN_SET_FC_FTYPE(n) (((unsigned short)(n)) << 2)
		#define WLAN_SET_FC_FSTYPE(n) (((unsigned short)(n)) << 4)
		@@ -269,8 +258,6 @@
		#define WLAN_SET_ERP_USE_PROTECTION(n) ((n) << 1)
		#define WLAN_SET_ERP_BARKER_MODE(n) ((n) << 2)



		/* Support & Basic Rates field */
		#define WLAN_MGMT_IS_BASICRATE(b) ((b) & BIT7)
		#define WLAN_MGMT_GET_RATE(b) ((b) & ~BIT7)
		@@ -294,29 +281,24 @@ typedef struct {
		/* 802.11 Header Format */

		typedef struct tagWLAN_80211HDR_A2 {

		unsigned short wFrameCtl;
		unsigned short wDurationID;
		unsigned char abyAddr1[WLAN_ADDR_LEN];
		unsigned char abyAddr2[WLAN_ADDR_LEN];

		} __attribute__ ((__packed__))
		WLAN_80211HDR_A2, *PWLAN_80211HDR_A2;

		typedef struct tagWLAN_80211HDR_A3 {

		unsigned short wFrameCtl;
		unsigned short wDurationID;
		unsigned char abyAddr1[WLAN_ADDR_LEN];
		unsigned char abyAddr2[WLAN_ADDR_LEN];
		unsigned char abyAddr3[WLAN_ADDR_LEN];
		unsigned short wSeqCtl;

		} __attribute__ ((__packed__))
		WLAN_80211HDR_A3, *PWLAN_80211HDR_A3;

		typedef struct tagWLAN_80211HDR_A4 {

		unsigned short wFrameCtl;
		unsigned short wDurationID;
		unsigned char abyAddr1[WLAN_ADDR_LEN];
		@@ -324,28 +306,19 @@ typedef struct tagWLAN_80211HDR_A4 {
		unsigned char abyAddr3[WLAN_ADDR_LEN];
		unsigned short wSeqCtl;
		unsigned char abyAddr4[WLAN_ADDR_LEN];

		} __attribute__ ((__packed__))
		WLAN_80211HDR_A4, *PWLAN_80211HDR_A4;


		typedef union tagUWLAN_80211HDR {

		WLAN_80211HDR_A2 sA2;
		WLAN_80211HDR_A3 sA3;
		WLAN_80211HDR_A4 sA4;

		} UWLAN_80211HDR, *PUWLAN_80211HDR;


		/--------------------- Export Classes ----------------------------/

		/--------------------- Export Variables --------------------------/

		/--------------------- Export Functions --------------------------/



		#endif /* __80211HDR_H__ */

drivers/staging/vt6655/80211mgr.c

+0 −37

Original line number	Diff line number	Diff line
		@@ -61,8 +61,6 @@

		/--------------------- Static Definitions -------------------------/



		/--------------------- Static Classes ----------------------------/

		/--------------------- Static Variables --------------------------/
		@@ -71,14 +69,10 @@ static int msglevel = MSG_LEVEL_INFO;
		//static int msglevel =MSG_LEVEL_DEBUG;
		/--------------------- Static Functions --------------------------/



		/--------------------- Export Variables --------------------------/


		/--------------------- Export Functions --------------------------/


		/*+
		*
		* Routine Description:
		@@ -120,7 +114,6 @@ vMgrEncodeBeacon(
		*
		-*/


		void
		vMgrDecodeBeacon(
		PWLAN_FR_BEACON pFrame
		@@ -142,7 +135,6 @@ vMgrDecodeBeacon(
		pItem = (PWLAN_IE)((unsigned char *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)))
		+ WLAN_BEACON_OFF_SSID);
		while (((unsigned char *)pItem) < (pFrame->pBuf + pFrame->len)) {

		switch (pItem->byElementID) {
		case WLAN_EID_SSID:
		if (pFrame->pSSID == NULL)
		@@ -229,7 +221,6 @@ vMgrDecodeBeacon(
		return;
		}


		/*+
		*
		* Routine Description:
		@@ -241,7 +232,6 @@ vMgrDecodeBeacon(
		*
		-*/


		void
		vMgrEncodeIBSSATIM(
		PWLAN_FR_IBSSATIM pFrame
		@@ -253,7 +243,6 @@ vMgrEncodeIBSSATIM(
		return;
		}


		/*+
		*
		* Routine Description:
		@@ -275,7 +264,6 @@ vMgrDecodeIBSSATIM(
		return;
		}


		/*+
		*
		* Routine Description:
		@@ -294,7 +282,6 @@ vMgrEncodeDisassociation(
		{
		pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf;


		// Fixed Fields
		pFrame->pwReason = (unsigned short *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
		+ WLAN_DISASSOC_OFF_REASON);
		@@ -303,7 +290,6 @@ vMgrEncodeDisassociation(
		return;
		}


		/*+
		*
		* Routine Description:
		@@ -340,7 +326,6 @@ vMgrDecodeDisassociation(
		*
		-*/


		void
		vMgrEncodeAssocRequest(
		PWLAN_FR_ASSOCREQ pFrame
		@@ -356,7 +341,6 @@ vMgrEncodeAssocRequest(
		return;
		}


		/*+
		*
		* Routine Description: (AP)
		@@ -454,7 +438,6 @@ vMgrEncodeAssocResponse(
		return;
		}


		/*+
		*
		* Routine Description:
		@@ -500,7 +483,6 @@ vMgrDecodeAssocResponse(
		return;
		}


		/*+
		*
		* Routine Description:
		@@ -531,7 +513,6 @@ vMgrEncodeReassocRequest(
		return;
		}


		/*+
		*
		* Routine Description: (AP)
		@@ -543,7 +524,6 @@ vMgrEncodeReassocRequest(
		*
		-*/


		void
		vMgrDecodeReassocRequest(
		PWLAN_FR_REASSOCREQ pFrame
		@@ -565,7 +545,6 @@ vMgrDecodeReassocRequest(
		+ WLAN_REASSOCREQ_OFF_SSID);

		while (((unsigned char *)pItem) < (pFrame->pBuf + pFrame->len)) {

		switch (pItem->byElementID) {
		case WLAN_EID_SSID:
		if (pFrame->pSSID == NULL)
		@@ -602,8 +581,6 @@ vMgrDecodeReassocRequest(
		return;
		}



		/*+
		*
		* Routine Description:
		@@ -615,7 +592,6 @@ vMgrDecodeReassocRequest(
		*
		-*/


		void
		vMgrEncodeProbeRequest(
		PWLAN_FR_PROBEREQ pFrame
		@@ -650,7 +626,6 @@ vMgrDecodeProbeRequest(
		pItem = (PWLAN_IE)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)));

		while (((unsigned char *)pItem) < (pFrame->pBuf + pFrame->len)) {

		switch (pItem->byElementID) {
		case WLAN_EID_SSID:
		if (pFrame->pSSID == NULL)
		@@ -677,7 +652,6 @@ vMgrDecodeProbeRequest(
		return;
		}


		/*+
		*
		* Routine Description:
		@@ -689,7 +663,6 @@ vMgrDecodeProbeRequest(
		*
		-*/


		void
		vMgrEncodeProbeResponse(
		PWLAN_FR_PROBERESP pFrame
		@@ -711,8 +684,6 @@ vMgrEncodeProbeResponse(
		return;
		}



		/*+
		*
		* Routine Description:
		@@ -731,7 +702,6 @@ vMgrDecodeProbeResponse(
		{
		PWLAN_IE pItem;


		pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf;

		// Fixed Fields
		@@ -826,7 +796,6 @@ vMgrDecodeProbeResponse(
		return;
		}


		/*+
		*
		* Routine Description:
		@@ -857,7 +826,6 @@ vMgrEncodeAuthen(
		return;
		}


		/*+
		*
		* Routine Description:
		@@ -897,7 +865,6 @@ vMgrDecodeAuthen(
		return;
		}


		/*+
		*
		* Routine Description:
		@@ -924,7 +891,6 @@ vMgrEncodeDeauthen(
		return;
		}


		/*+
		*
		* Routine Description:
		@@ -950,7 +916,6 @@ vMgrDecodeDeauthen(
		return;
		}


		/*+
		*
		* Routine Description: (AP)
		@@ -982,7 +947,6 @@ vMgrEncodeReassocResponse(
		return;
		}


		/*+
		*
		* Routine Description:
		@@ -994,7 +958,6 @@ vMgrEncodeReassocResponse(
		*
		-*/


		void
		vMgrDecodeReassocResponse(
		PWLAN_FR_REASSOCRESP pFrame

drivers/staging/vt6655/80211mgr.h

+0 −50

Original line number	Diff line number	Diff line
		@@ -65,7 +65,6 @@
		// reference WiFi WPA spec.
		#define WLAN_EID_RSN_WPA 221


		#define WLAN_EID_ERP_NONERP_PRESENT 0x01
		#define WLAN_EID_ERP_USE_PROTECTION 0x02
		#define WLAN_EID_ERP_BARKER_MODE 0x04
		@@ -132,14 +131,10 @@
		#define WLAN_MGMT_STATUS_INVALID_RSN_IE_CAP 45
		#define WLAN_MGMT_STATUS_CIPHER_REJECT 46



		// Auth Algorithm
		#define WLAN_AUTH_ALG_OPENSYSTEM 0
		#define WLAN_AUTH_ALG_SHAREDKEY 1



		// Management Frame Field Offsets
		// Note: Not all fields are listed because of variable lengths.
		// Note: These offsets are from the start of the frame data
		@@ -184,7 +179,6 @@

		#define WLAN_DEAUTHEN_OFF_REASON 0


		//
		// Cipher Suite Selectors defined in 802.11i
		//
		@@ -217,15 +211,12 @@
		#define MEASURE_MODE_INCAPABLE 0x02
		#define MEASURE_MODE_REFUSED 0x04



		/--------------------- Export Classes ----------------------------/

		/--------------------- Export Variables --------------------------/

		/--------------------- Export Types ------------------------------/


		// Information Element Types

		#pragma pack(1)
		@@ -235,7 +226,6 @@ typedef struct tagWLAN_IE {
		} __attribute__ ((__packed__))
		WLAN_IE, *PWLAN_IE;


		// Service Set Identity (SSID)
		#pragma pack(1)
		typedef struct tagWLAN_IE_SSID {
		@@ -245,7 +235,6 @@ typedef struct tagWLAN_IE_SSID {
		} __attribute__ ((__packed__))
		WLAN_IE_SSID, *PWLAN_IE_SSID;


		// Supported Rates
		#pragma pack(1)
		typedef struct tagWLAN_IE_SUPP_RATES {
		@@ -255,8 +244,6 @@ typedef struct tagWLAN_IE_SUPP_RATES {
		} __attribute__ ((__packed__))
		WLAN_IE_SUPP_RATES, *PWLAN_IE_SUPP_RATES;



		// FH Parameter Set
		#pragma pack(1)
		typedef struct _WLAN_IE_FH_PARMS {
		@@ -277,7 +264,6 @@ typedef struct tagWLAN_IE_DS_PARMS {
		} __attribute__ ((__packed__))
		WLAN_IE_DS_PARMS, *PWLAN_IE_DS_PARMS;


		// CF Parameter Set
		#pragma pack(1)
		typedef struct tagWLAN_IE_CF_PARMS {
		@@ -290,7 +276,6 @@ typedef struct tagWLAN_IE_CF_PARMS {
		} __attribute__ ((__packed__))
		WLAN_IE_CF_PARMS, *PWLAN_IE_CF_PARMS;


		// TIM
		#pragma pack(1)
		typedef struct tagWLAN_IE_TIM {
		@@ -303,7 +288,6 @@ typedef struct tagWLAN_IE_TIM {
		} __attribute__ ((__packed__))
		WLAN_IE_TIM, *PWLAN_IE_TIM;


		// IBSS Parameter Set
		#pragma pack(1)
		typedef struct tagWLAN_IE_IBSS_PARMS {
		@@ -313,7 +297,6 @@ typedef struct tagWLAN_IE_IBSS_PARMS {
		} __attribute__ ((__packed__))
		WLAN_IE_IBSS_PARMS, *PWLAN_IE_IBSS_PARMS;


		// Challenge Text
		#pragma pack(1)
		typedef struct tagWLAN_IE_CHALLENGE {
		@@ -323,7 +306,6 @@ typedef struct tagWLAN_IE_CHALLENGE {
		} __attribute__ ((__packed__))
		WLAN_IE_CHALLENGE, *PWLAN_IE_CHALLENGE;


		#pragma pack(1)
		typedef struct tagWLAN_IE_RSN_EXT {
		unsigned char byElementID;
		@@ -355,7 +337,6 @@ typedef struct tagWLAN_IE_RSN {
		unsigned char abyRSN[WLAN_MIN_ARRAY];
		} WLAN_IE_RSN, *PWLAN_IE_RSN;


		// ERP
		#pragma pack(1)
		typedef struct tagWLAN_IE_ERP {
		@@ -365,7 +346,6 @@ typedef struct tagWLAN_IE_ERP {
		} __attribute__ ((__packed__))
		WLAN_IE_ERP, *PWLAN_IE_ERP;


		#pragma pack(1)
		typedef struct _MEASEURE_REQ {
		unsigned char byChannel;
		@@ -398,11 +378,9 @@ typedef struct _MEASEURE_REP_RPI {
		} MEASEURE_REP_RPI, *PMEASEURE_REP_RPI;

		typedef union _MEASEURE_REP {

		MEASEURE_REP_BASIC sBasic;
		MEASEURE_REP_CCA sCCA;
		MEASEURE_REP_RPI sRPI;

		} MEASEURE_REP, *PMEASEURE_REP;

		typedef struct _WLAN_IE_MEASURE_REQ {
		@@ -478,7 +456,6 @@ typedef struct _WLAN_IE_TPC_REP {
		unsigned char byLinkMargin;
		} WLAN_IE_TPC_REP, *PWLAN_IE_TPC_REP;


		typedef struct _WLAN_IE_IBSS_DFS {
		unsigned char byElementID;
		unsigned char len;
		@@ -489,22 +466,17 @@ typedef struct _WLAN_IE_IBSS_DFS {

		#pragma pack()



		// Frame Types
		// prototype structure, all mgmt frame types will start with these members
		typedef struct tagWLAN_FR_MGMT {

		unsigned int uType;
		unsigned int len;
		unsigned char *pBuf;
		PUWLAN_80211HDR pHdr;

		} WLAN_FR_MGMT, *PWLAN_FR_MGMT;

		// Beacon frame
		typedef struct tagWLAN_FR_BEACON {

		unsigned int uType;
		unsigned int len;
		unsigned char *pBuf;
		@@ -530,13 +502,10 @@ typedef struct tagWLAN_FR_BEACON {
		PWLAN_IE_CH_SW pIE_CHSW;
		PWLAN_IE_IBSS_DFS pIE_IBSSDFS;
		PWLAN_IE_QUIET pIE_Quiet;

		} WLAN_FR_BEACON, *PWLAN_FR_BEACON;


		// IBSS ATIM frame
		typedef struct tagWLAN_FR_IBSSATIM {

		unsigned int uType;
		unsigned int len;
		unsigned char *pBuf;
		@@ -545,12 +514,10 @@ typedef struct tagWLAN_FR_IBSSATIM {
		// fixed fields
		// info elements
		// this frame type has a null body

		} WLAN_FR_IBSSATIM, *PWLAN_FR_IBSSATIM;

		// Disassociation
		typedef struct tagWLAN_FR_DISASSOC {

		unsigned int uType;
		unsigned int len;
		unsigned char *pBuf;
		@@ -558,12 +525,10 @@ typedef struct tagWLAN_FR_DISASSOC {
		/-- fixed fields -----------/
		unsigned short *pwReason;
		/-- info elements ----------/

		} WLAN_FR_DISASSOC, *PWLAN_FR_DISASSOC;

		// Association Request
		typedef struct tagWLAN_FR_ASSOCREQ {

		unsigned int uType;
		unsigned int len;
		unsigned char *pBuf;
		@@ -579,12 +544,10 @@ typedef struct tagWLAN_FR_ASSOCREQ {
		PWLAN_IE_SUPP_RATES pExtSuppRates;
		PWLAN_IE_PW_CAP pCurrPowerCap;
		PWLAN_IE_SUPP_CH pCurrSuppCh;

		} WLAN_FR_ASSOCREQ, *PWLAN_FR_ASSOCREQ;

		// Association Response
		typedef struct tagWLAN_FR_ASSOCRESP {

		unsigned int uType;
		unsigned int len;
		unsigned char *pBuf;
		@@ -596,12 +559,10 @@ typedef struct tagWLAN_FR_ASSOCRESP {
		/-- info elements ----------/
		PWLAN_IE_SUPP_RATES pSuppRates;
		PWLAN_IE_SUPP_RATES pExtSuppRates;

		} WLAN_FR_ASSOCRESP, *PWLAN_FR_ASSOCRESP;

		// Reassociation Request
		typedef struct tagWLAN_FR_REASSOCREQ {

		unsigned int uType;
		unsigned int len;
		unsigned char *pBuf;
		@@ -618,12 +579,10 @@ typedef struct tagWLAN_FR_REASSOCREQ {
		PWLAN_IE_RSN pRSN;
		PWLAN_IE_RSN_EXT pRSNWPA;
		PWLAN_IE_SUPP_RATES pExtSuppRates;

		} WLAN_FR_REASSOCREQ, *PWLAN_FR_REASSOCREQ;

		// Reassociation Response
		typedef struct tagWLAN_FR_REASSOCRESP {

		unsigned int uType;
		unsigned int len;
		unsigned char *pBuf;
		@@ -635,12 +594,10 @@ typedef struct tagWLAN_FR_REASSOCRESP {
		/-- info elements ----------/
		PWLAN_IE_SUPP_RATES pSuppRates;
		PWLAN_IE_SUPP_RATES pExtSuppRates;

		} WLAN_FR_REASSOCRESP, *PWLAN_FR_REASSOCRESP;

		// Probe Request
		typedef struct tagWLAN_FR_PROBEREQ {

		unsigned int uType;
		unsigned int len;
		unsigned char *pBuf;
		@@ -650,12 +607,10 @@ typedef struct tagWLAN_FR_PROBEREQ {
		PWLAN_IE_SSID pSSID;
		PWLAN_IE_SUPP_RATES pSuppRates;
		PWLAN_IE_SUPP_RATES pExtSuppRates;

		} WLAN_FR_PROBEREQ, *PWLAN_FR_PROBEREQ;

		// Probe Response
		typedef struct tagWLAN_FR_PROBERESP {

		unsigned int uType;
		unsigned int len;
		unsigned char *pBuf;
		@@ -679,12 +634,10 @@ typedef struct tagWLAN_FR_PROBERESP {
		PWLAN_IE_CH_SW pIE_CHSW;
		PWLAN_IE_IBSS_DFS pIE_IBSSDFS;
		PWLAN_IE_QUIET pIE_Quiet;

		} WLAN_FR_PROBERESP, *PWLAN_FR_PROBERESP;

		// Authentication
		typedef struct tagWLAN_FR_AUTHEN {

		unsigned int uType;
		unsigned int len;
		unsigned char *pBuf;
		@@ -695,12 +648,10 @@ typedef struct tagWLAN_FR_AUTHEN {
		unsigned short *pwStatus;
		/-- info elements ----------/
		PWLAN_IE_CHALLENGE pChallenge;

		} WLAN_FR_AUTHEN, *PWLAN_FR_AUTHEN;

		// Deauthenication
		typedef struct tagWLAN_FR_DEAUTHEN {

		unsigned int uType;
		unsigned int len;
		unsigned char *pBuf;
		@@ -709,7 +660,6 @@ typedef struct tagWLAN_FR_DEAUTHEN {
		unsigned short *pwReason;

		/-- info elements ----------/

		} WLAN_FR_DEAUTHEN, *PWLAN_FR_DEAUTHEN;

		/--------------------- Export Functions --------------------------/

drivers/staging/vt6655/IEEE11h.c

+0 −7

Original line number	Diff line number	Diff line
		@@ -120,7 +120,6 @@ static bool s_bRxMSRReq(PSMgmtObject pMgmt, PWLAN_FRAME_MSRREQ pMSRReq,
		return bResult;
		}


		static bool s_bRxTPCReq(PSMgmtObject pMgmt,
		PWLAN_FRAME_TPCREQ pTPCReq,
		unsigned char byRate,
		@@ -195,15 +194,12 @@ static bool s_bRxTPCReq(PSMgmtObject pMgmt,
		return true;
		/* return CARDbSendPacket(pMgmt->pAdapter, pFrame, PKT_TYPE_802_11_MNG,
		sizeof(WLAN_FRAME_TPCREP)); */

		}


		/--------------------- Export Variables --------------------------/

		/--------------------- Export Functions --------------------------/


		/*+
		*
		* Description:
		@@ -285,7 +281,6 @@ IEEE11hbMgrRxAction(void pMgmtHandle, void pRxPacket)
		return true;
		}


		bool IEEE11hbMSRRepTx(void *pMgmtHandle)
		{
		PSMgmtObject pMgmt = (PSMgmtObject) pMgmtHandle;
		@@ -324,6 +319,4 @@ bool IEEE11hbMSRRepTx(void *pMgmtHandle)
		return true;
		/* return CARDbSendPacket(pMgmt->pAdapter, pMSRRep, PKT_TYPE_802_11_MNG,
		uLength); */

		}

drivers/staging/vt6655/aes_ccmp.c

+0 −7

Original line number	Diff line number	Diff line
		@@ -122,7 +122,6 @@ void xor_128(unsigned char a, unsigned char b, unsigned char *out)
		(dwPtrOut++) = (dwPtrA++) ^ (*dwPtrB++);
		}


		void xor_32(unsigned char a, unsigned char b, unsigned char *out)
		{
		unsigned long dwPtrA = (unsigned long )a;
		@@ -181,14 +180,12 @@ void ShiftRows(unsigned char in, unsigned char out)

		void MixColumns(unsigned char in, unsigned char out)
		{

		out[0] = dot2_table[in[0]] ^ dot3_table[in[1]] ^ in[2] ^ in[3];
		out[1] = in[0] ^ dot2_table[in[1]] ^ dot3_table[in[2]] ^ in[3];
		out[2] = in[0] ^ in[1] ^ dot2_table[in[2]] ^ dot3_table[in[3]];
		out[3] = dot3_table[in[0]] ^ in[1] ^ in[2] ^ dot2_table[in[3]];
		}


		void AESv128(unsigned char key, unsigned char data, unsigned char *ciphertext)
		{
		int i;
		@@ -220,7 +217,6 @@ void AESv128(unsigned char key, unsigned char data, unsigned char *ciphertext)
		AddRoundKey(abyRoundKey, round);
		}
		}

		}

		/*
		@@ -259,7 +255,6 @@ bool AESbGenCCMP(unsigned char pbyRxKey, unsigned char pbyFrame, unsigned shor
		unsigned short wCnt;
		int ii, jj, kk;


		pbyIV = pbyFrame + WLAN_HDR_ADDR3_LEN;
		if (WLAN_GET_FC_TODS((unsigned short )pbyFrame) &&
		WLAN_GET_FC_FROMDS((unsigned short )pbyFrame)) {
		@@ -330,7 +325,6 @@ bool AESbGenCCMP(unsigned char pbyRxKey, unsigned char pbyFrame, unsigned shor
		memcpy(&(abyCTRPLD[1]), &(abyNonce[0]), 13);

		for (jj = wPayloadSize; jj > 16; jj = jj - 16) {

		abyCTRPLD[14] = (unsigned char)(wCnt >> 8);
		abyCTRPLD[15] = (unsigned char)(wCnt & 0xff);

		@@ -392,5 +386,4 @@ bool AESbGenCCMP(unsigned char pbyRxKey, unsigned char pbyFrame, unsigned shor
		} else {
		return false;
		}

		}