Commit bb127932 authored by Moritz Muehlenhoff's avatar Moritz Muehlenhoff Committed by Greg Kroah-Hartman
Browse files

Staging: wlan-ng: p80211mgmt.h: Coding style cleanups 



Signed-off-by: default avatarMoritz Muehlenhoff <jmm@debian.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent a32fb5f7

drivers/staging/wlan-ng/p80211mgmt.h

+189 −225
Original line number Diff line number Diff line
@@ -157,8 +157,6 @@ 
#define WLAN_MGMT_STATUS_ASSOC_DENIED_NOPBCC	20

#define WLAN_MGMT_STATUS_ASSOC_DENIED_NOAGILITY	21







/*-- Auth Algorithm Field ---------------------------*/

#define WLAN_AUTH_ALG_OPENSYSTEM		0

#define WLAN_AUTH_ALG_SHAREDKEY			1
@@ -208,10 +206,6 @@ 


#define WLAN_DEAUTHEN_OFF_REASON		0





/*================================================================*/

/* Macros */



/*-- Capability Field ---------------------------*/

#define WLAN_GET_MGMT_CAP_INFO_ESS(n)		((n) & BIT(0))

#define WLAN_GET_MGMT_CAP_INFO_IBSS(n)		(((n) & BIT(1)) >> 1)
@@ -233,38 +227,30 @@ 
#define WLAN_SET_MGMT_CAP_INFO_PBCC(n)		((n) << 6)

#define WLAN_SET_MGMT_CAP_INFO_AGILITY(n)	((n) << 7)





/*================================================================*/

/* Types */



/*-- Information Element Types --------------------*/

/* prototype structure, all IEs start with these members */



typedef struct wlan_ie

{

typedef struct wlan_ie {

	u8 eid;

	u8 len;

} __attribute__ ((packed)) wlan_ie_t;



/*-- Service Set Identity (SSID)  -----------------*/

typedef struct wlan_ie_ssid

{

typedef struct wlan_ie_ssid {

	u8 eid;

	u8 len;

	u8 ssid[1];		/* may be zero, ptrs may overlap */

} __attribute__ ((packed)) wlan_ie_ssid_t;



/*-- Supported Rates  -----------------------------*/

typedef struct wlan_ie_supp_rates

{

typedef struct wlan_ie_supp_rates {

	u8 eid;

	u8 len;

	u8 rates[1];		/* had better be at LEAST one! */

} __attribute__ ((packed)) wlan_ie_supp_rates_t;



/*-- FH Parameter Set  ----------------------------*/

typedef struct wlan_ie_fh_parms

{

typedef struct wlan_ie_fh_parms {

	u8 eid;

	u8 len;

	u16 dwell;
@@ -274,8 +260,7 @@ typedef struct wlan_ie_fh_parms 
} __attribute__ ((packed)) wlan_ie_fh_parms_t;



/*-- DS Parameter Set  ----------------------------*/

typedef struct wlan_ie_ds_parms

{

typedef struct wlan_ie_ds_parms {

	u8 eid;

	u8 len;

	u8 curr_ch;
@@ -283,8 +268,7 @@ typedef struct wlan_ie_ds_parms 


/*-- CF Parameter Set  ----------------------------*/



typedef struct wlan_ie_cf_parms

{

typedef struct wlan_ie_cf_parms {

	u8 eid;

	u8 len;

	u8 cfp_cnt;
@@ -294,8 +278,7 @@ typedef struct wlan_ie_cf_parms 
} __attribute__ ((packed)) wlan_ie_cf_parms_t;



/*-- TIM ------------------------------------------*/

typedef struct wlan_ie_tim

{

typedef struct wlan_ie_tim {

	u8 eid;

	u8 len;

	u8 dtim_cnt;
@@ -305,16 +288,14 @@ typedef struct wlan_ie_tim 
} __attribute__ ((packed)) wlan_ie_tim_t;



/*-- IBSS Parameter Set ---------------------------*/

typedef struct wlan_ie_ibss_parms

{

typedef struct wlan_ie_ibss_parms {

	u8 eid;

	u8 len;

	u16 atim_win;

} __attribute__ ((packed)) wlan_ie_ibss_parms_t;



/*-- Challenge Text  ------------------------------*/

typedef struct wlan_ie_challenge

{

typedef struct wlan_ie_challenge {

	u8 eid;

	u8 len;

	u8 challenge[1];
@@ -324,8 +305,7 @@ typedef struct wlan_ie_challenge 
/*  Frame Types  */



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

typedef struct wlan_fr_mgmt

{

typedef struct wlan_fr_mgmt {

	u16 type;

	u16 len;		/* DOES NOT include CRC !!!! */

	u8 *buf;
@@ -337,8 +317,7 @@ typedef struct wlan_fr_mgmt 
} wlan_fr_mgmt_t;



/*-- Beacon ---------------------------------------*/

typedef struct wlan_fr_beacon

{

typedef struct wlan_fr_beacon {

	u16 type;

	u16 len;

	u8 *buf;
@@ -360,10 +339,8 @@ typedef struct wlan_fr_beacon 


} wlan_fr_beacon_t;





/*-- IBSS ATIM ------------------------------------*/

typedef struct wlan_fr_ibssatim

{

typedef struct wlan_fr_ibssatim {

	u16 type;

	u16 len;

	u8 *buf;
@@ -379,8 +356,7 @@ typedef struct wlan_fr_ibssatim 
} wlan_fr_ibssatim_t;



/*-- Disassociation -------------------------------*/

typedef struct wlan_fr_disassoc

{

typedef struct wlan_fr_disassoc {

	u16 type;

	u16 len;

	u8 *buf;
@@ -395,8 +371,7 @@ typedef struct wlan_fr_disassoc 
} wlan_fr_disassoc_t;



/*-- Association Request --------------------------*/

typedef struct wlan_fr_assocreq

{

typedef struct wlan_fr_assocreq {

	u16 type;

	u16 len;

	u8 *buf;
@@ -413,8 +388,7 @@ typedef struct wlan_fr_assocreq 
} wlan_fr_assocreq_t;



/*-- Association Response -------------------------*/

typedef struct wlan_fr_assocresp

{

typedef struct wlan_fr_assocresp {

	u16 type;

	u16 len;

	u8 *buf;
@@ -431,8 +405,7 @@ typedef struct wlan_fr_assocresp 
} wlan_fr_assocresp_t;



/*-- Reassociation Request ------------------------*/

typedef struct wlan_fr_reassocreq

{

typedef struct wlan_fr_reassocreq {

	u16 type;

	u16 len;

	u8 *buf;
@@ -450,8 +423,7 @@ typedef struct wlan_fr_reassocreq 
} wlan_fr_reassocreq_t;



/*-- Reassociation Response -----------------------*/

typedef struct wlan_fr_reassocresp

{

typedef struct wlan_fr_reassocresp {

	u16 type;

	u16 len;

	u8 *buf;
@@ -468,8 +440,7 @@ typedef struct wlan_fr_reassocresp 
} wlan_fr_reassocresp_t;



/*-- Probe Request --------------------------------*/

typedef struct wlan_fr_probereq

{

typedef struct wlan_fr_probereq {

	u16 type;

	u16 len;

	u8 *buf;
@@ -484,8 +455,7 @@ typedef struct wlan_fr_probereq 
} wlan_fr_probereq_t;



/*-- Probe Response -------------------------------*/

typedef struct wlan_fr_proberesp

{

typedef struct wlan_fr_proberesp {

	u16 type;

	u16 len;

	u8 *buf;
@@ -506,8 +476,7 @@ typedef struct wlan_fr_proberesp 
} wlan_fr_proberesp_t;



/*-- Authentication -------------------------------*/

typedef struct wlan_fr_authen

{

typedef struct wlan_fr_authen {

	u16 type;

	u16 len;

	u8 *buf;
@@ -524,8 +493,7 @@ typedef struct wlan_fr_authen 
} wlan_fr_authen_t;



/*-- Deauthenication -----------------------------*/

typedef struct wlan_fr_deauthen

{

typedef struct wlan_fr_deauthen {

	u16 type;

	u16 len;

	u8 *buf;
@@ -539,9 +507,6 @@ typedef struct wlan_fr_deauthen 


} wlan_fr_deauthen_t;



/*================================================================*/

/* Function Declarations */



void wlan_mgmt_encode_beacon(wlan_fr_beacon_t *f);

void wlan_mgmt_decode_beacon(wlan_fr_beacon_t *f);

void wlan_mgmt_encode_disassoc(wlan_fr_disassoc_t *f);
@@ -563,5 +528,4 @@ void wlan_mgmt_decode_authen( wlan_fr_authen_t *f ); 
void wlan_mgmt_encode_deauthen(wlan_fr_deauthen_t *f);

void wlan_mgmt_decode_deauthen(wlan_fr_deauthen_t *f);





#endif /* _P80211MGMT_H */