Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 77970254 authored by Andres More's avatar Andres More Committed by Greg Kroah-Hartman
Browse files

staging: vt6656: cleared 'do not use C99 // comments' checkpatch errors 



switched all // comments on file to respective /**/

Signed-off-by: default avatarAndres More <more.andres@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 42d1aeea

drivers/staging/vt6656/80211mgr.h

+76 −89
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ 


#define WLAN_MIN_ARRAY          1



// Information Element ID value

/* Information Element ID value */

#define WLAN_EID_SSID           0

#define WLAN_EID_SUPP_RATES     1

#define WLAN_EID_FH_PARMS       2
@@ -59,10 +59,10 @@ 
#define WLAN_EID_QUIET          40

#define WLAN_EID_IBSS_DFS       41

#define WLAN_EID_ERP            42

// reference 802.11i 7.3.2 table 20

/* reference 802.11i 7.3.2 table 20 */

#define WLAN_EID_RSN            48

#define WLAN_EID_EXTSUPP_RATES  50

// reference WiFi WPA spec.

/* reference WiFi WPA spec */

#define WLAN_EID_RSN_WPA        221



#ifdef Cisco_ccx
@@ -75,7 +75,7 @@ 
#define WLAN_EID_ERP_USE_PROTECTION             0x02

#define WLAN_EID_ERP_BARKER_MODE                0x04



// Reason Codes

/* reason codes */

#define WLAN_MGMT_REASON_RSVD                       0

#define WLAN_MGMT_REASON_UNSPEC                     1

#define WLAN_MGMT_REASON_PRIOR_AUTH_INVALID         2
@@ -100,7 +100,7 @@ 
#define WLAN_MGMT_REASON_RSNE_CAP_INVALID           22

#define WLAN_MGMT_REASON_80211X_AUTH_FAILED         23



// Status Codes

/* status codes */

#define WLAN_MGMT_STATUS_SUCCESS                        0

#define WLAN_MGMT_STATUS_UNSPEC_FAILURE                 1

#define WLAN_MGMT_STATUS_CAPS_UNSUPPORTED               10
@@ -116,19 +116,16 @@ 
#define WLAN_MGMT_STATUS_ASSOC_DENIED_PBCC              20

#define WLAN_MGMT_STATUS_ASSOC_DENIED_AGILITY           21



// reference 802.11h 7.3.1.9

//

/* reference 802.11h 7.3.1.9 */

#define WLAN_MGMT_STATUS_ASSOC_REJECT_BCS_SPECTRUM_MNG  22

#define WLAN_MGMT_STATUS_ASSOC_REJECT_BCS_PWR_CAP       23

#define WLAN_MGMT_STATUS_ASSOC_REJECT_BCS_SUPP_CH       24

//

// reference 802.11g 7.3.1.9

//



/* reference 802.11g 7.3.1.9 */

#define WLAN_MGMT_STATUS_SHORTSLOTTIME_UNSUPPORTED      25

#define WLAN_MGMT_STATUS_DSSSOFDM_UNSUPPORTED           26

//

// reference 802.11i 7.3.1.9 table 19

//



/* reference 802.11i 7.3.1.9 table 19 */

#define WLAN_MGMT_STATUS_INVALID_IE                     40

#define WLAN_MGMT_STATUS_GROUP_CIPHER_INVALID           41

#define WLAN_MGMT_STATUS_PAIRWISE_CIPHER_INVALID        42
@@ -137,17 +134,16 @@ 
#define WLAN_MGMT_STATUS_INVALID_RSN_IE_CAP             45

#define WLAN_MGMT_STATUS_CIPHER_REJECT                  46







// Auth Algorithm

/* auth algorithm */

#define WLAN_AUTH_ALG_OPENSYSTEM                0

#define WLAN_AUTH_ALG_SHAREDKEY                 1



/* management frame field offsets */





// 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

/*

 * Note: Not all fields are listed because of variable lengths

 * Note: These offsets are from the start of the frame data

 */



#define WLAN_BEACON_OFF_TS                  0

#define WLAN_BEACON_OFF_BCN_INT             8
@@ -189,10 +185,7 @@ 


#define WLAN_DEAUTHEN_OFF_REASON            0





//

// Cipher Suite Selectors defined in 802.11i

//

/* cipher suite selectors defined in 802.11i */

#define WLAN_11i_CSS_USE_GROUP              0

#define WLAN_11i_CSS_WEP40                  1

#define WLAN_11i_CSS_TKIP                   2
@@ -200,24 +193,22 @@ 
#define WLAN_11i_CSS_WEP104                 5

#define WLAN_11i_CSS_UNKNOWN                255



//

// Authentication and Key Management Suite Selectors defined in 802.11i

//

/* authentication and key management suite selectors defined in 802.11i */

#define WLAN_11i_AKMSS_802_1X               1

#define WLAN_11i_AKMSS_PSK                  2

#define WLAN_11i_AKMSS_UNKNOWN              255



// Measurement type definitions reference ieee 802.11h Table 20b

/* measurement type definitions reference IEEE 802.11h table 20b */

#define MEASURE_TYPE_BASIC      0

#define MEASURE_TYPE_CCA        1

#define MEASURE_TYPE_RPI        2



// Measurement request mode definitions reference ieee 802.11h Figure 46h

/* measurement request mode definitions reference IEEE 802.11h figure 46h */

#define MEASURE_MODE_ENABLE     0x02

#define MEASURE_MODE_REQ        0x04

#define MEASURE_MODE_REP        0x08



// Measurement report mode definitions reference ieee 802.11h Figure 46m

/* measurement report mode definitions reference IEEE 802.11h figure 46m */

#define MEASURE_MODE_LATE       0x01

#define MEASURE_MODE_INCAPABLE  0x02

#define MEASURE_MODE_REFUSED    0x04
@@ -228,7 +219,7 @@ 


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



// Information Element Types

/* Information Element types */



#pragma pack(1)

typedef struct tagWLAN_IE {
@@ -237,7 +228,7 @@ typedef struct tagWLAN_IE { 
} __attribute__ ((__packed__))

WLAN_IE, *PWLAN_IE;



// Service Set Identity (SSID)

/* Service Set IDentity (SSID) */

#pragma pack(1)

typedef struct tagWLAN_IE_SSID {

    BYTE   byElementID;
@@ -246,7 +237,7 @@ typedef struct tagWLAN_IE_SSID { 
} __attribute__ ((__packed__))

WLAN_IE_SSID, *PWLAN_IE_SSID;



// Supported Rates

/* Supported Rates */

#pragma pack(1)

typedef struct tagWLAN_IE_SUPP_RATES {

    BYTE   byElementID;
@@ -255,7 +246,7 @@ typedef struct tagWLAN_IE_SUPP_RATES { 
} __attribute__ ((__packed__))

WLAN_IE_SUPP_RATES,  *PWLAN_IE_SUPP_RATES;



// FH Parameter Set

/* FH Parameter Set */

#pragma pack(1)

typedef struct _WLAN_IE_FH_PARMS {

    BYTE    byElementID;
@@ -266,7 +257,7 @@ typedef struct _WLAN_IE_FH_PARMS { 
    BYTE    byHopIndex;

} WLAN_IE_FH_PARMS,  *PWLAN_IE_FH_PARMS;



// DS Parameter Set

/* DS Parameter Set */

#pragma pack(1)

typedef struct tagWLAN_IE_DS_PARMS {

    BYTE   byElementID;
@@ -275,7 +266,7 @@ typedef struct tagWLAN_IE_DS_PARMS { 
} __attribute__ ((__packed__))

WLAN_IE_DS_PARMS,  *PWLAN_IE_DS_PARMS;



// CF Parameter Set

/* CF Parameter Set */

#pragma pack(1)

typedef struct tagWLAN_IE_CF_PARMS {

    BYTE   byElementID;
@@ -287,7 +278,7 @@ typedef struct tagWLAN_IE_CF_PARMS { 
} __attribute__ ((__packed__))

WLAN_IE_CF_PARMS,  *PWLAN_IE_CF_PARMS;



// TIM

/* TIM */

#pragma pack(1)

typedef struct tagWLAN_IE_TIM {

    BYTE   byElementID;
@@ -299,7 +290,7 @@ typedef struct tagWLAN_IE_TIM { 
} __attribute__ ((__packed__))

WLAN_IE_TIM,  *PWLAN_IE_TIM;



// IBSS Parameter Set

/* IBSS Parameter Set */

#pragma pack(1)

typedef struct tagWLAN_IE_IBSS_PARMS {

    BYTE   byElementID;
@@ -308,7 +299,7 @@ typedef struct tagWLAN_IE_IBSS_PARMS { 
} __attribute__ ((__packed__))

WLAN_IE_IBSS_PARMS, *PWLAN_IE_IBSS_PARMS;



// Challenge Text

/* Challenge Text */

#pragma pack(1)

typedef struct tagWLAN_IE_CHALLENGE {

    BYTE   byElementID;
@@ -327,8 +318,8 @@ typedef struct tagWLAN_IE_RSN_EXT { 
    WORD wPKCount;

	struct {

		BYTE abyOUI[4];

    } PKSList[1]; // the rest is variable so need to

    // overlay ieauth structure

	} PKSList[1];

	/* the rest is variable so need to overlay ieauth structure */

} WLAN_IE_RSN_EXT, *PWLAN_IE_RSN_EXT;



#pragma pack(1)
@@ -339,7 +330,7 @@ typedef struct tagWLAN_IE_RSN_AUTH { 
    } AuthKSList[1];

} WLAN_IE_RSN_AUTH, *PWLAN_IE_RSN_AUTH;



// RSN Identity

/* RSN Identity */

#pragma pack(1)

typedef struct tagWLAN_IE_RSN {

    BYTE   byElementID;
@@ -348,8 +339,7 @@ typedef struct tagWLAN_IE_RSN { 
    BYTE   abyRSN[WLAN_MIN_ARRAY];

} WLAN_IE_RSN, *PWLAN_IE_RSN;





// CCX Identity DavidWang

/* CCX Identity DavidWang */

#pragma pack(1)

typedef struct tagWLAN_IE_CCX {

BYTE   byElementID;
@@ -371,9 +361,7 @@ BYTE len; 
BYTE   abyCCXVer[5];

} WLAN_IE_CCX_Ver, *PWLAN_IE_CCX_Ver;







// ERP

/* ERP */

#pragma pack(1)

typedef struct tagWLAN_IE_ERP {

    BYTE   byElementID;
@@ -505,10 +493,9 @@ typedef struct _WLAN_IE_IBSS_DFS { 


#pragma pack()



/* frame types */





// Frame Types

// prototype structure, all mgmt frame types will start with these members

/* prototype structure, all mgmt frame types will start with these members */

typedef struct tagWLAN_FR_MGMT {



    unsigned int                  uType;
@@ -518,21 +505,21 @@ typedef struct tagWLAN_FR_MGMT { 


} WLAN_FR_MGMT,  *PWLAN_FR_MGMT;



// Beacon frame

/* beacon frame */

typedef struct tagWLAN_FR_BEACON {



    unsigned int                    uType;

    unsigned int                    len;

    PBYTE                   pBuf;

    PUWLAN_80211HDR         pHdr;

    // fixed fields

	/* fixed fields */

	u64 *pqwTimestamp;

    PWORD                   pwBeaconInterval;

    PWORD                   pwCapInfo;

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

    /* info elements */

    PWLAN_IE_SSID           pSSID;

    PWLAN_IE_SUPP_RATES     pSuppRates;

//  PWLAN_IE_FH_PARMS       pFHParms;

/*  PWLAN_IE_FH_PARMS       pFHParms; */

    PWLAN_IE_DS_PARMS       pDSParms;

    PWLAN_IE_CF_PARMS       pCFParms;

    PWLAN_IE_TIM            pTIM;
@@ -549,8 +536,7 @@ typedef struct tagWLAN_FR_BEACON { 


} WLAN_FR_BEACON, *PWLAN_FR_BEACON;





// IBSS ATIM frame

/* IBSS ATIM frame */

typedef struct tagWLAN_FR_IBSSATIM {



    unsigned int                    uType;
@@ -558,36 +544,36 @@ typedef struct tagWLAN_FR_IBSSATIM { 
    PBYTE                   pBuf;

    PUWLAN_80211HDR         pHdr;



    // fixed fields

    // info elements

    // this frame type has a null body

	/* fixed fields */

	/* info elements */

	/* this frame type has a null body */



} WLAN_FR_IBSSATIM, *PWLAN_FR_IBSSATIM;



// Disassociation

/* disassociation */

typedef struct tagWLAN_FR_DISASSOC {



    unsigned int                    uType;

    unsigned int                    len;

    PBYTE                   pBuf;

    PUWLAN_80211HDR         pHdr;

    /*-- fixed fields -----------*/

    /* fixed fields */

    PWORD                   pwReason;

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

    /* info elements */



} WLAN_FR_DISASSOC, *PWLAN_FR_DISASSOC;



// Association Request

/* association request */

typedef struct tagWLAN_FR_ASSOCREQ {



    unsigned int                    uType;

    unsigned int                    len;

    PBYTE                   pBuf;

    PUWLAN_80211HDR         pHdr;

    /*-- fixed fields -----------*/

    /* fixed fields */

    PWORD                   pwCapInfo;

    PWORD                   pwListenInterval;

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

    /* info elements */

    PWLAN_IE_SSID           pSSID;

    PWLAN_IE_SUPP_RATES     pSuppRates;

    PWLAN_IE_RSN            pRSN;
@@ -601,24 +587,24 @@ typedef struct tagWLAN_FR_ASSOCREQ { 


} WLAN_FR_ASSOCREQ, *PWLAN_FR_ASSOCREQ;



// Association Response

/* association response */

typedef struct tagWLAN_FR_ASSOCRESP {



    unsigned int                    uType;

    unsigned int                    len;

    PBYTE                   pBuf;

    PUWLAN_80211HDR         pHdr;

    /*-- fixed fields -----------*/

    /* fixed fields */

    PWORD                   pwCapInfo;

    PWORD                   pwStatus;

    PWORD                   pwAid;

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

    /* info elements */

    PWLAN_IE_SUPP_RATES     pSuppRates;

    PWLAN_IE_SUPP_RATES     pExtSuppRates;



} WLAN_FR_ASSOCRESP, *PWLAN_FR_ASSOCRESP;



// Reassociation Request

/* reassociation request */

typedef struct tagWLAN_FR_REASSOCREQ {



    unsigned int                    uType;
@@ -626,12 +612,12 @@ typedef struct tagWLAN_FR_REASSOCREQ { 
    PBYTE                   pBuf;

    PUWLAN_80211HDR         pHdr;



    /*-- fixed fields -----------*/

    /* fixed fields */

    PWORD                   pwCapInfo;

    PWORD                   pwListenInterval;

    PIEEE_ADDR              pAddrCurrAP;



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

    /* info elements */

    PWLAN_IE_SSID           pSSID;

    PWLAN_IE_SUPP_RATES     pSuppRates;

    PWLAN_IE_RSN            pRSN;
@@ -643,50 +629,50 @@ typedef struct tagWLAN_FR_REASSOCREQ { 


} WLAN_FR_REASSOCREQ, *PWLAN_FR_REASSOCREQ;



// Reassociation Response

/* reassociation response */

typedef struct tagWLAN_FR_REASSOCRESP {



    unsigned int                    uType;

    unsigned int                    len;

    PBYTE                   pBuf;

    PUWLAN_80211HDR         pHdr;

    /*-- fixed fields -----------*/

    /* fixed fields */

    PWORD                   pwCapInfo;

    PWORD                   pwStatus;

    PWORD                   pwAid;

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

    /* info elements */

    PWLAN_IE_SUPP_RATES     pSuppRates;

    PWLAN_IE_SUPP_RATES     pExtSuppRates;



} WLAN_FR_REASSOCRESP, *PWLAN_FR_REASSOCRESP;



// Probe Request

/* probe request */

typedef struct tagWLAN_FR_PROBEREQ {



    unsigned int                    uType;

    unsigned int                    len;

    PBYTE                   pBuf;

    PUWLAN_80211HDR         pHdr;

    /*-- fixed fields -----------*/

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

    /* fixed fields */

    /* info elements */

    PWLAN_IE_SSID           pSSID;

    PWLAN_IE_SUPP_RATES     pSuppRates;

    PWLAN_IE_SUPP_RATES     pExtSuppRates;



} WLAN_FR_PROBEREQ, *PWLAN_FR_PROBEREQ;



// Probe Response

/* probe response */

typedef struct tagWLAN_FR_PROBERESP {



    unsigned int                    uType;

    unsigned int                    len;

    PBYTE                   pBuf;

    PUWLAN_80211HDR         pHdr;

    /*-- fixed fields -----------*/

    /* fixed fields */

	u64 *pqwTimestamp;

    PWORD                   pwBeaconInterval;

    PWORD                   pwCapInfo;

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

    /* info elements */

    PWLAN_IE_SSID           pSSID;

    PWLAN_IE_SUPP_RATES     pSuppRates;

    PWLAN_IE_DS_PARMS       pDSParms;
@@ -704,37 +690,38 @@ typedef struct tagWLAN_FR_PROBERESP { 


} WLAN_FR_PROBERESP, *PWLAN_FR_PROBERESP;



// Authentication

/* authentication */

typedef struct tagWLAN_FR_AUTHEN {



    unsigned int                    uType;

    unsigned int                    len;

    PBYTE                   pBuf;

    PUWLAN_80211HDR         pHdr;

    /*-- fixed fields -----------*/

    /* fixed fields */

    PWORD                   pwAuthAlgorithm;

    PWORD                   pwAuthSequence;

    PWORD                   pwStatus;

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

    /* info elements */

    PWLAN_IE_CHALLENGE      pChallenge;



} WLAN_FR_AUTHEN, *PWLAN_FR_AUTHEN;



// Deauthentication

/* deauthentication */

typedef struct tagWLAN_FR_DEAUTHEN {



    unsigned int                    uType;

    unsigned int                    len;

    PBYTE                   pBuf;

    PUWLAN_80211HDR         pHdr;

    /*-- fixed fields -----------*/

    /* fixed fields */

    PWORD                   pwReason;



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

    /* info elements */



} WLAN_FR_DEAUTHEN, *PWLAN_FR_DEAUTHEN;



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



void

vMgrEncodeBeacon(

      PWLAN_FR_BEACON  pFrame
@@ -845,4 +832,4 @@ vMgrDecodeReassocResponse( 
      PWLAN_FR_REASSOCRESP  pFrame

    );



#endif// __80211MGR_H__
 
#endif /* __80211MGR_H__ */