Commit e2665c2c authored by Ebru Akagunduz's avatar Ebru Akagunduz Committed by Peter P Waskiewicz Jr
Browse files

Staging: wlan-ng: Fix do not add new typedefs in p80211mgmt.h



Fix checkpatch.pl issues with do not add new typedefs in p80211mgmt.h

Signed-off-by: default avatarEbru Akagunduz <ebru.akagunduz@gmail.com>
Signed-off-by: default avatarPeter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
parent de7ecde6
Loading
Loading
Loading
Loading
+85 −85
Original line number Diff line number Diff line
@@ -219,82 +219,82 @@
/*-- Information Element Types --------------------*/
/* prototype structure, all IEs start with these members */

typedef struct wlan_ie {
struct wlan_ie {
	u8 eid;
	u8 len;
} __packed wlan_ie_t;
} __packed;

/*-- Service Set Identity (SSID)  -----------------*/
typedef struct wlan_ie_ssid {
struct wlan_ie_ssid {
	u8 eid;
	u8 len;
	u8 ssid[1];		/* may be zero, ptrs may overlap */
} __packed wlan_ie_ssid_t;
} __packed;

/*-- Supported Rates  -----------------------------*/
typedef struct wlan_ie_supp_rates {
struct wlan_ie_supp_rates {
	u8 eid;
	u8 len;
	u8 rates[1];		/* had better be at LEAST one! */
} __packed wlan_ie_supp_rates_t;
} __packed;

/*-- FH Parameter Set  ----------------------------*/
typedef struct wlan_ie_fh_parms {
struct wlan_ie_fh_parms {
	u8 eid;
	u8 len;
	u16 dwell;
	u8 hopset;
	u8 hoppattern;
	u8 hopindex;
} __packed wlan_ie_fh_parms_t;
} __packed;

/*-- DS Parameter Set  ----------------------------*/
typedef struct wlan_ie_ds_parms {
struct wlan_ie_ds_parms {
	u8 eid;
	u8 len;
	u8 curr_ch;
} __packed wlan_ie_ds_parms_t;
} __packed;

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

typedef struct wlan_ie_cf_parms {
struct wlan_ie_cf_parms {
	u8 eid;
	u8 len;
	u8 cfp_cnt;
	u8 cfp_period;
	u16 cfp_maxdur;
	u16 cfp_durremaining;
} __packed wlan_ie_cf_parms_t;
} __packed;

/*-- TIM ------------------------------------------*/
typedef struct wlan_ie_tim {
struct wlan_ie_tim {
	u8 eid;
	u8 len;
	u8 dtim_cnt;
	u8 dtim_period;
	u8 bitmap_ctl;
	u8 virt_bm[1];
} __packed wlan_ie_tim_t;
} __packed;

/*-- IBSS Parameter Set ---------------------------*/
typedef struct wlan_ie_ibss_parms {
struct wlan_ie_ibss_parms {
	u8 eid;
	u8 len;
	u16 atim_win;
} __packed wlan_ie_ibss_parms_t;
} __packed;

/*-- Challenge Text  ------------------------------*/
typedef struct wlan_ie_challenge {
struct wlan_ie_challenge {
	u8 eid;
	u8 len;
	u8 challenge[1];
} __packed wlan_ie_challenge_t;
} __packed;

/*-------------------------------------------------*/
/*  Frame Types  */

/* prototype structure, all mgmt frame types will start with these members */
typedef struct wlan_fr_mgmt {
struct wlan_fr_mgmt {
	u16 type;
	u16 len;		/* DOES NOT include CRC !!!! */
	u8 *buf;
@@ -303,10 +303,10 @@ typedef struct wlan_fr_mgmt {
	void *priv;
	/*-- fixed fields -----------*/
	/*-- info elements ----------*/
} wlan_fr_mgmt_t;
};

/*-- Beacon ---------------------------------------*/
typedef struct wlan_fr_beacon {
struct wlan_fr_beacon {
	u16 type;
	u16 len;
	u8 *buf;
@@ -318,18 +318,18 @@ typedef struct wlan_fr_beacon {
	u16 *bcn_int;
	u16 *cap_info;
	/*-- info elements ----------*/
	wlan_ie_ssid_t *ssid;
	wlan_ie_supp_rates_t *supp_rates;
	wlan_ie_fh_parms_t *fh_parms;
	wlan_ie_ds_parms_t *ds_parms;
	wlan_ie_cf_parms_t *cf_parms;
	wlan_ie_ibss_parms_t *ibss_parms;
	wlan_ie_tim_t *tim;
	struct wlan_ie_ssid *ssid;
	struct wlan_ie_supp_rates *supp_rates;
	struct wlan_ie_fh_parms *fh_parms;
	struct wlan_ie_ds_parms *ds_parms;
	struct wlan_ie_cf_parms *cf_parms;
	struct wlan_ie_ibss_parms *ibss_parms;
	struct wlan_ie_tim *tim;

} wlan_fr_beacon_t;
};

/*-- IBSS ATIM ------------------------------------*/
typedef struct wlan_fr_ibssatim {
struct wlan_fr_ibssatim {
	u16 type;
	u16 len;
	u8 *buf;
@@ -342,10 +342,10 @@ typedef struct wlan_fr_ibssatim {

	/* this frame type has a null body */

} wlan_fr_ibssatim_t;
};

/*-- Disassociation -------------------------------*/
typedef struct wlan_fr_disassoc {
struct wlan_fr_disassoc {
	u16 type;
	u16 len;
	u8 *buf;
@@ -357,10 +357,10 @@ typedef struct wlan_fr_disassoc {

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

} wlan_fr_disassoc_t;
};

/*-- Association Request --------------------------*/
typedef struct wlan_fr_assocreq {
struct wlan_fr_assocreq {
	u16 type;
	u16 len;
	u8 *buf;
@@ -371,13 +371,13 @@ typedef struct wlan_fr_assocreq {
	u16 *cap_info;
	u16 *listen_int;
	/*-- info elements ----------*/
	wlan_ie_ssid_t *ssid;
	wlan_ie_supp_rates_t *supp_rates;
	struct wlan_ie_ssid *ssid;
	struct wlan_ie_supp_rates *supp_rates;

} wlan_fr_assocreq_t;
};

/*-- Association Response -------------------------*/
typedef struct wlan_fr_assocresp {
struct wlan_fr_assocresp {
	u16 type;
	u16 len;
	u8 *buf;
@@ -389,12 +389,12 @@ typedef struct wlan_fr_assocresp {
	u16 *status;
	u16 *aid;
	/*-- info elements ----------*/
	wlan_ie_supp_rates_t *supp_rates;
	struct wlan_ie_supp_rates *supp_rates;

} wlan_fr_assocresp_t;
};

/*-- Reassociation Request ------------------------*/
typedef struct wlan_fr_reassocreq {
struct wlan_fr_reassocreq {
	u16 type;
	u16 len;
	u8 *buf;
@@ -406,13 +406,13 @@ typedef struct wlan_fr_reassocreq {
	u16 *listen_int;
	u8 *curr_ap;
	/*-- info elements ----------*/
	wlan_ie_ssid_t *ssid;
	wlan_ie_supp_rates_t *supp_rates;
	struct wlan_ie_ssid *ssid;
	struct wlan_ie_supp_rates *supp_rates;

} wlan_fr_reassocreq_t;
};

/*-- Reassociation Response -----------------------*/
typedef struct wlan_fr_reassocresp {
struct wlan_fr_reassocresp {
	u16 type;
	u16 len;
	u8 *buf;
@@ -424,12 +424,12 @@ typedef struct wlan_fr_reassocresp {
	u16 *status;
	u16 *aid;
	/*-- info elements ----------*/
	wlan_ie_supp_rates_t *supp_rates;
	struct wlan_ie_supp_rates *supp_rates;

} wlan_fr_reassocresp_t;
};

/*-- Probe Request --------------------------------*/
typedef struct wlan_fr_probereq {
struct wlan_fr_probereq {
	u16 type;
	u16 len;
	u8 *buf;
@@ -438,13 +438,13 @@ typedef struct wlan_fr_probereq {
	void *priv;
	/*-- fixed fields -----------*/
	/*-- info elements ----------*/
	wlan_ie_ssid_t *ssid;
	wlan_ie_supp_rates_t *supp_rates;
	struct wlan_ie_ssid *ssid;
	struct wlan_ie_supp_rates *supp_rates;

} wlan_fr_probereq_t;
};

/*-- Probe Response -------------------------------*/
typedef struct wlan_fr_proberesp {
struct wlan_fr_proberesp {
	u16 type;
	u16 len;
	u8 *buf;
@@ -456,16 +456,16 @@ typedef struct wlan_fr_proberesp {
	u16 *bcn_int;
	u16 *cap_info;
	/*-- info elements ----------*/
	wlan_ie_ssid_t *ssid;
	wlan_ie_supp_rates_t *supp_rates;
	wlan_ie_fh_parms_t *fh_parms;
	wlan_ie_ds_parms_t *ds_parms;
	wlan_ie_cf_parms_t *cf_parms;
	wlan_ie_ibss_parms_t *ibss_parms;
} wlan_fr_proberesp_t;
	struct wlan_ie_ssid *ssid;
	struct wlan_ie_supp_rates *supp_rates;
	struct wlan_ie_fh_parms *fh_parms;
	struct wlan_ie_ds_parms *ds_parms;
	struct wlan_ie_cf_parms *cf_parms;
	struct wlan_ie_ibss_parms *ibss_parms;
};

/*-- Authentication -------------------------------*/
typedef struct wlan_fr_authen {
struct wlan_fr_authen {
	u16 type;
	u16 len;
	u8 *buf;
@@ -477,12 +477,12 @@ typedef struct wlan_fr_authen {
	u16 *auth_seq;
	u16 *status;
	/*-- info elements ----------*/
	wlan_ie_challenge_t *challenge;
	struct wlan_ie_challenge *challenge;

} wlan_fr_authen_t;
};

/*-- Deauthenication -----------------------------*/
typedef struct wlan_fr_deauthen {
struct wlan_fr_deauthen {
	u16 type;
	u16 len;
	u8 *buf;
@@ -494,27 +494,27 @@ typedef struct wlan_fr_deauthen {

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

} wlan_fr_deauthen_t;

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);
void wlan_mgmt_decode_disassoc(wlan_fr_disassoc_t *f);
void wlan_mgmt_encode_assocreq(wlan_fr_assocreq_t *f);
void wlan_mgmt_decode_assocreq(wlan_fr_assocreq_t *f);
void wlan_mgmt_encode_assocresp(wlan_fr_assocresp_t *f);
void wlan_mgmt_decode_assocresp(wlan_fr_assocresp_t *f);
void wlan_mgmt_encode_reassocreq(wlan_fr_reassocreq_t *f);
void wlan_mgmt_decode_reassocreq(wlan_fr_reassocreq_t *f);
void wlan_mgmt_encode_reassocresp(wlan_fr_reassocresp_t *f);
void wlan_mgmt_decode_reassocresp(wlan_fr_reassocresp_t *f);
void wlan_mgmt_encode_probereq(wlan_fr_probereq_t *f);
void wlan_mgmt_decode_probereq(wlan_fr_probereq_t *f);
void wlan_mgmt_encode_proberesp(wlan_fr_proberesp_t *f);
void wlan_mgmt_decode_proberesp(wlan_fr_proberesp_t *f);
void wlan_mgmt_encode_authen(wlan_fr_authen_t *f);
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);
};

void wlan_mgmt_encode_beacon(struct wlan_fr_beacon *f);
void wlan_mgmt_decode_beacon(struct wlan_fr_beacon *f);
void wlan_mgmt_encode_disassoc(struct wlan_fr_disassoc *f);
void wlan_mgmt_decode_disassoc(struct wlan_fr_disassoc *f);
void wlan_mgmt_encode_assocreq(struct wlan_fr_assocreq *f);
void wlan_mgmt_decode_assocreq(struct wlan_fr_assocreq *f);
void wlan_mgmt_encode_assocresp(struct wlan_fr_assocresp *f);
void wlan_mgmt_decode_assocresp(struct wlan_fr_assocresp *f);
void wlan_mgmt_encode_reassocreq(struct wlan_fr_reassocreq *f);
void wlan_mgmt_decode_reassocreq(struct wlan_fr_reassocreq *f);
void wlan_mgmt_encode_reassocresp(struct wlan_fr_reassocresp *f);
void wlan_mgmt_decode_reassocresp(struct wlan_fr_reassocresp *f);
void wlan_mgmt_encode_probereq(struct wlan_fr_probereq *f);
void wlan_mgmt_decode_probereq(struct wlan_fr_probereq *f);
void wlan_mgmt_encode_proberesp(struct wlan_fr_proberesp *f);
void wlan_mgmt_decode_proberesp(struct wlan_fr_proberesp *f);
void wlan_mgmt_encode_authen(struct wlan_fr_authen *f);
void wlan_mgmt_decode_authen(struct wlan_fr_authen *f);
void wlan_mgmt_encode_deauthen(struct wlan_fr_deauthen *f);
void wlan_mgmt_decode_deauthen(struct wlan_fr_deauthen *f);

#endif /* _P80211MGMT_H */