Commit 7d3864d1 authored by Bas van den Berg's avatar Bas van den Berg Committed by Greg Kroah-Hartman

Staging: wlan-ng: fixed packed checkpatch warnings

Signed-off-by: default avatarBas van den Berg <b.van.den.berg.nl@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 37af07d1
...@@ -352,12 +352,12 @@ PD Record codes ...@@ -352,12 +352,12 @@ PD Record codes
typedef struct hfa384x_bytestr { typedef struct hfa384x_bytestr {
u16 len; u16 len;
u8 data[0]; u8 data[0];
} __attribute__ ((packed)) hfa384x_bytestr_t; } __packed hfa384x_bytestr_t;
typedef struct hfa384x_bytestr32 { typedef struct hfa384x_bytestr32 {
u16 len; u16 len;
u8 data[32]; u8 data[32];
} __attribute__ ((packed)) hfa384x_bytestr32_t; } __packed hfa384x_bytestr32_t;
/*-------------------------------------------------------------------- /*--------------------------------------------------------------------
Configuration Record Structures: Configuration Record Structures:
...@@ -370,7 +370,7 @@ typedef struct hfa384x_compident { ...@@ -370,7 +370,7 @@ typedef struct hfa384x_compident {
u16 variant; u16 variant;
u16 major; u16 major;
u16 minor; u16 minor;
} __attribute__ ((packed)) hfa384x_compident_t; } __packed hfa384x_compident_t;
typedef struct hfa384x_caplevel { typedef struct hfa384x_caplevel {
u16 role; u16 role;
...@@ -378,7 +378,7 @@ typedef struct hfa384x_caplevel { ...@@ -378,7 +378,7 @@ typedef struct hfa384x_caplevel {
u16 variant; u16 variant;
u16 bottom; u16 bottom;
u16 top; u16 top;
} __attribute__ ((packed)) hfa384x_caplevel_t; } __packed hfa384x_caplevel_t;
/*-- Configuration Record: cnfAuthentication --*/ /*-- Configuration Record: cnfAuthentication --*/
#define HFA384x_CNFAUTHENTICATION_OPENSYSTEM 0x0001 #define HFA384x_CNFAUTHENTICATION_OPENSYSTEM 0x0001
...@@ -397,26 +397,26 @@ typedef struct hfa384x_HostScanRequest_data { ...@@ -397,26 +397,26 @@ typedef struct hfa384x_HostScanRequest_data {
u16 channelList; u16 channelList;
u16 txRate; u16 txRate;
hfa384x_bytestr32_t ssid; hfa384x_bytestr32_t ssid;
} __attribute__ ((packed)) hfa384x_HostScanRequest_data_t; } __packed hfa384x_HostScanRequest_data_t;
/*-- Configuration Record: JoinRequest (data portion only) --*/ /*-- Configuration Record: JoinRequest (data portion only) --*/
typedef struct hfa384x_JoinRequest_data { typedef struct hfa384x_JoinRequest_data {
u8 bssid[WLAN_BSSID_LEN]; u8 bssid[WLAN_BSSID_LEN];
u16 channel; u16 channel;
} __attribute__ ((packed)) hfa384x_JoinRequest_data_t; } __packed hfa384x_JoinRequest_data_t;
/*-- Configuration Record: authenticateStation (data portion only) --*/ /*-- Configuration Record: authenticateStation (data portion only) --*/
typedef struct hfa384x_authenticateStation_data { typedef struct hfa384x_authenticateStation_data {
u8 address[ETH_ALEN]; u8 address[ETH_ALEN];
u16 status; u16 status;
u16 algorithm; u16 algorithm;
} __attribute__ ((packed)) hfa384x_authenticateStation_data_t; } __packed hfa384x_authenticateStation_data_t;
/*-- Configuration Record: WPAData (data portion only) --*/ /*-- Configuration Record: WPAData (data portion only) --*/
typedef struct hfa384x_WPAData { typedef struct hfa384x_WPAData {
u16 datalen; u16 datalen;
u8 data[0]; /* max 80 */ u8 data[0]; /* max 80 */
} __attribute__ ((packed)) hfa384x_WPAData_t; } __packed hfa384x_WPAData_t;
/*-------------------------------------------------------------------- /*--------------------------------------------------------------------
Information Record Structures: NIC Information Information Record Structures: NIC Information
...@@ -428,7 +428,7 @@ typedef struct hfa384x_downloadbuffer { ...@@ -428,7 +428,7 @@ typedef struct hfa384x_downloadbuffer {
u16 page; u16 page;
u16 offset; u16 offset;
u16 len; u16 len;
} __attribute__ ((packed)) hfa384x_downloadbuffer_t; } __packed hfa384x_downloadbuffer_t;
/*-------------------------------------------------------------------- /*--------------------------------------------------------------------
Information Record Structures: NIC Information Information Record Structures: NIC Information
...@@ -441,14 +441,14 @@ typedef struct hfa384x_commsquality { ...@@ -441,14 +441,14 @@ typedef struct hfa384x_commsquality {
u16 CQ_currBSS; u16 CQ_currBSS;
u16 ASL_currBSS; u16 ASL_currBSS;
u16 ANL_currFC; u16 ANL_currFC;
} __attribute__ ((packed)) hfa384x_commsquality_t; } __packed hfa384x_commsquality_t;
/*-- Information Record: dmbcommsquality --*/ /*-- Information Record: dmbcommsquality --*/
typedef struct hfa384x_dbmcommsquality { typedef struct hfa384x_dbmcommsquality {
u16 CQdbm_currBSS; u16 CQdbm_currBSS;
u16 ASLdbm_currBSS; u16 ASLdbm_currBSS;
u16 ANLdbm_currFC; u16 ANLdbm_currFC;
} __attribute__ ((packed)) hfa384x_dbmcommsquality_t; } __packed hfa384x_dbmcommsquality_t;
/*-------------------------------------------------------------------- /*--------------------------------------------------------------------
FRAME STRUCTURES: Communication Frames FRAME STRUCTURES: Communication Frames
...@@ -481,7 +481,7 @@ typedef struct hfa384x_tx_frame { ...@@ -481,7 +481,7 @@ typedef struct hfa384x_tx_frame {
u8 dest_addr[6]; u8 dest_addr[6];
u8 src_addr[6]; u8 src_addr[6];
u16 data_length; /* big endian format */ u16 data_length; /* big endian format */
} __attribute__ ((packed)) hfa384x_tx_frame_t; } __packed hfa384x_tx_frame_t;
/*-------------------------------------------------------------------- /*--------------------------------------------------------------------
Communication Frames: Field Masks for Transmit Frames Communication Frames: Field Masks for Transmit Frames
--------------------------------------------------------------------*/ --------------------------------------------------------------------*/
...@@ -543,7 +543,7 @@ typedef struct hfa384x_rx_frame { ...@@ -543,7 +543,7 @@ typedef struct hfa384x_rx_frame {
u8 dest_addr[6]; u8 dest_addr[6];
u8 src_addr[6]; u8 src_addr[6];
u16 data_length; /* IEEE? (big endian) format */ u16 data_length; /* IEEE? (big endian) format */
} __attribute__ ((packed)) hfa384x_rx_frame_t; } __packed hfa384x_rx_frame_t;
/*-------------------------------------------------------------------- /*--------------------------------------------------------------------
Communication Frames: Field Masks for Receive Frames Communication Frames: Field Masks for Receive Frames
--------------------------------------------------------------------*/ --------------------------------------------------------------------*/
...@@ -607,7 +607,7 @@ typedef struct hfa384x_CommTallies16 { ...@@ -607,7 +607,7 @@ typedef struct hfa384x_CommTallies16 {
u16 rxdiscardswepundecr; u16 rxdiscardswepundecr;
u16 rxmsginmsgfrag; u16 rxmsginmsgfrag;
u16 rxmsginbadmsgfrag; u16 rxmsginbadmsgfrag;
} __attribute__ ((packed)) hfa384x_CommTallies16_t; } __packed hfa384x_CommTallies16_t;
typedef struct hfa384x_CommTallies32 { typedef struct hfa384x_CommTallies32 {
u32 txunicastframes; u32 txunicastframes;
...@@ -631,7 +631,7 @@ typedef struct hfa384x_CommTallies32 { ...@@ -631,7 +631,7 @@ typedef struct hfa384x_CommTallies32 {
u32 rxdiscardswepundecr; u32 rxdiscardswepundecr;
u32 rxmsginmsgfrag; u32 rxmsginmsgfrag;
u32 rxmsginbadmsgfrag; u32 rxmsginbadmsgfrag;
} __attribute__ ((packed)) hfa384x_CommTallies32_t; } __packed hfa384x_CommTallies32_t;
/*-- Inquiry Frame, Diagnose: Scan Results & Subfields--*/ /*-- Inquiry Frame, Diagnose: Scan Results & Subfields--*/
typedef struct hfa384x_ScanResultSub { typedef struct hfa384x_ScanResultSub {
...@@ -644,13 +644,13 @@ typedef struct hfa384x_ScanResultSub { ...@@ -644,13 +644,13 @@ typedef struct hfa384x_ScanResultSub {
hfa384x_bytestr32_t ssid; hfa384x_bytestr32_t ssid;
u8 supprates[10]; /* 802.11 info element */ u8 supprates[10]; /* 802.11 info element */
u16 proberesp_rate; u16 proberesp_rate;
} __attribute__ ((packed)) hfa384x_ScanResultSub_t; } __packed hfa384x_ScanResultSub_t;
typedef struct hfa384x_ScanResult { typedef struct hfa384x_ScanResult {
u16 rsvd; u16 rsvd;
u16 scanreason; u16 scanreason;
hfa384x_ScanResultSub_t result[HFA384x_SCANRESULT_MAX]; hfa384x_ScanResultSub_t result[HFA384x_SCANRESULT_MAX];
} __attribute__ ((packed)) hfa384x_ScanResult_t; } __packed hfa384x_ScanResult_t;
/*-- Inquiry Frame, Diagnose: ChInfo Results & Subfields--*/ /*-- Inquiry Frame, Diagnose: ChInfo Results & Subfields--*/
typedef struct hfa384x_ChInfoResultSub { typedef struct hfa384x_ChInfoResultSub {
...@@ -658,7 +658,7 @@ typedef struct hfa384x_ChInfoResultSub { ...@@ -658,7 +658,7 @@ typedef struct hfa384x_ChInfoResultSub {
u16 anl; u16 anl;
u16 pnl; u16 pnl;
u16 active; u16 active;
} __attribute__ ((packed)) hfa384x_ChInfoResultSub_t; } __packed hfa384x_ChInfoResultSub_t;
#define HFA384x_CHINFORESULT_BSSACTIVE BIT(0) #define HFA384x_CHINFORESULT_BSSACTIVE BIT(0)
#define HFA384x_CHINFORESULT_PCFACTIVE BIT(1) #define HFA384x_CHINFORESULT_PCFACTIVE BIT(1)
...@@ -666,7 +666,7 @@ typedef struct hfa384x_ChInfoResultSub { ...@@ -666,7 +666,7 @@ typedef struct hfa384x_ChInfoResultSub {
typedef struct hfa384x_ChInfoResult { typedef struct hfa384x_ChInfoResult {
u16 scanchannels; u16 scanchannels;
hfa384x_ChInfoResultSub_t result[HFA384x_CHINFORESULT_MAX]; hfa384x_ChInfoResultSub_t result[HFA384x_CHINFORESULT_MAX];
} __attribute__ ((packed)) hfa384x_ChInfoResult_t; } __packed hfa384x_ChInfoResult_t;
/*-- Inquiry Frame, Diagnose: Host Scan Results & Subfields--*/ /*-- Inquiry Frame, Diagnose: Host Scan Results & Subfields--*/
typedef struct hfa384x_HScanResultSub { typedef struct hfa384x_HScanResultSub {
...@@ -680,13 +680,13 @@ typedef struct hfa384x_HScanResultSub { ...@@ -680,13 +680,13 @@ typedef struct hfa384x_HScanResultSub {
u8 supprates[10]; /* 802.11 info element */ u8 supprates[10]; /* 802.11 info element */
u16 proberesp_rate; u16 proberesp_rate;
u16 atim; u16 atim;
} __attribute__ ((packed)) hfa384x_HScanResultSub_t; } __packed hfa384x_HScanResultSub_t;
typedef struct hfa384x_HScanResult { typedef struct hfa384x_HScanResult {
u16 nresult; u16 nresult;
u16 rsvd; u16 rsvd;
hfa384x_HScanResultSub_t result[HFA384x_HSCANRESULT_MAX]; hfa384x_HScanResultSub_t result[HFA384x_HSCANRESULT_MAX];
} __attribute__ ((packed)) hfa384x_HScanResult_t; } __packed hfa384x_HScanResult_t;
/*-- Unsolicited Frame, MAC Mgmt: LinkStatus --*/ /*-- Unsolicited Frame, MAC Mgmt: LinkStatus --*/
...@@ -700,7 +700,7 @@ typedef struct hfa384x_HScanResult { ...@@ -700,7 +700,7 @@ typedef struct hfa384x_HScanResult {
typedef struct hfa384x_LinkStatus { typedef struct hfa384x_LinkStatus {
u16 linkstatus; u16 linkstatus;
} __attribute__ ((packed)) hfa384x_LinkStatus_t; } __packed hfa384x_LinkStatus_t;
/*-- Unsolicited Frame, MAC Mgmt: AssociationStatus (--*/ /*-- Unsolicited Frame, MAC Mgmt: AssociationStatus (--*/
...@@ -715,25 +715,25 @@ typedef struct hfa384x_AssocStatus { ...@@ -715,25 +715,25 @@ typedef struct hfa384x_AssocStatus {
u8 old_ap_addr[ETH_ALEN]; u8 old_ap_addr[ETH_ALEN];
u16 reason; u16 reason;
u16 reserved; u16 reserved;
} __attribute__ ((packed)) hfa384x_AssocStatus_t; } __packed hfa384x_AssocStatus_t;
/*-- Unsolicited Frame, MAC Mgmt: AuthRequest (AP Only) --*/ /*-- Unsolicited Frame, MAC Mgmt: AuthRequest (AP Only) --*/
typedef struct hfa384x_AuthRequest { typedef struct hfa384x_AuthRequest {
u8 sta_addr[ETH_ALEN]; u8 sta_addr[ETH_ALEN];
u16 algorithm; u16 algorithm;
} __attribute__ ((packed)) hfa384x_AuthReq_t; } __packed hfa384x_AuthReq_t;
/*-- Unsolicited Frame, MAC Mgmt: PSUserCount (AP Only) --*/ /*-- Unsolicited Frame, MAC Mgmt: PSUserCount (AP Only) --*/
typedef struct hfa384x_PSUserCount { typedef struct hfa384x_PSUserCount {
u16 usercnt; u16 usercnt;
} __attribute__ ((packed)) hfa384x_PSUserCount_t; } __packed hfa384x_PSUserCount_t;
typedef struct hfa384x_KeyIDChanged { typedef struct hfa384x_KeyIDChanged {
u8 sta_addr[ETH_ALEN]; u8 sta_addr[ETH_ALEN];
u16 keyid; u16 keyid;
} __attribute__ ((packed)) hfa384x_KeyIDChanged_t; } __packed hfa384x_KeyIDChanged_t;
/*-- Collection of all Inf frames ---------------*/ /*-- Collection of all Inf frames ---------------*/
typedef union hfa384x_infodata { typedef union hfa384x_infodata {
...@@ -747,13 +747,13 @@ typedef union hfa384x_infodata { ...@@ -747,13 +747,13 @@ typedef union hfa384x_infodata {
hfa384x_AuthReq_t authreq; hfa384x_AuthReq_t authreq;
hfa384x_PSUserCount_t psusercnt; hfa384x_PSUserCount_t psusercnt;
hfa384x_KeyIDChanged_t keyidchanged; hfa384x_KeyIDChanged_t keyidchanged;
} __attribute__ ((packed)) hfa384x_infodata_t; } __packed hfa384x_infodata_t;
typedef struct hfa384x_InfFrame { typedef struct hfa384x_InfFrame {
u16 framelen; u16 framelen;
u16 infotype; u16 infotype;
hfa384x_infodata_t info; hfa384x_infodata_t info;
} __attribute__ ((packed)) hfa384x_InfFrame_t; } __packed hfa384x_InfFrame_t;
/*-------------------------------------------------------------------- /*--------------------------------------------------------------------
USB Packet structures and constants. USB Packet structures and constants.
...@@ -785,7 +785,7 @@ USB Packet structures and constants. ...@@ -785,7 +785,7 @@ USB Packet structures and constants.
typedef struct hfa384x_usb_txfrm { typedef struct hfa384x_usb_txfrm {
hfa384x_tx_frame_t desc; hfa384x_tx_frame_t desc;
u8 data[WLAN_DATA_MAXLEN]; u8 data[WLAN_DATA_MAXLEN];
} __attribute__ ((packed)) hfa384x_usb_txfrm_t; } __packed hfa384x_usb_txfrm_t;
typedef struct hfa384x_usb_cmdreq { typedef struct hfa384x_usb_cmdreq {
u16 type; u16 type;
...@@ -794,21 +794,21 @@ typedef struct hfa384x_usb_cmdreq { ...@@ -794,21 +794,21 @@ typedef struct hfa384x_usb_cmdreq {
u16 parm1; u16 parm1;
u16 parm2; u16 parm2;
u8 pad[54]; u8 pad[54];
} __attribute__ ((packed)) hfa384x_usb_cmdreq_t; } __packed hfa384x_usb_cmdreq_t;
typedef struct hfa384x_usb_wridreq { typedef struct hfa384x_usb_wridreq {
u16 type; u16 type;
u16 frmlen; u16 frmlen;
u16 rid; u16 rid;
u8 data[HFA384x_RIDDATA_MAXLEN]; u8 data[HFA384x_RIDDATA_MAXLEN];
} __attribute__ ((packed)) hfa384x_usb_wridreq_t; } __packed hfa384x_usb_wridreq_t;
typedef struct hfa384x_usb_rridreq { typedef struct hfa384x_usb_rridreq {
u16 type; u16 type;
u16 frmlen; u16 frmlen;
u16 rid; u16 rid;
u8 pad[58]; u8 pad[58];
} __attribute__ ((packed)) hfa384x_usb_rridreq_t; } __packed hfa384x_usb_rridreq_t;
typedef struct hfa384x_usb_wmemreq { typedef struct hfa384x_usb_wmemreq {
u16 type; u16 type;
...@@ -816,7 +816,7 @@ typedef struct hfa384x_usb_wmemreq { ...@@ -816,7 +816,7 @@ typedef struct hfa384x_usb_wmemreq {
u16 offset; u16 offset;
u16 page; u16 page;
u8 data[HFA384x_USB_RWMEM_MAXLEN]; u8 data[HFA384x_USB_RWMEM_MAXLEN];
} __attribute__ ((packed)) hfa384x_usb_wmemreq_t; } __packed hfa384x_usb_wmemreq_t;
typedef struct hfa384x_usb_rmemreq { typedef struct hfa384x_usb_rmemreq {
u16 type; u16 type;
...@@ -824,7 +824,7 @@ typedef struct hfa384x_usb_rmemreq { ...@@ -824,7 +824,7 @@ typedef struct hfa384x_usb_rmemreq {
u16 offset; u16 offset;
u16 page; u16 page;
u8 pad[56]; u8 pad[56];
} __attribute__ ((packed)) hfa384x_usb_rmemreq_t; } __packed hfa384x_usb_rmemreq_t;
/*------------------------------------*/ /*------------------------------------*/
/* Response (bulk IN) packet contents */ /* Response (bulk IN) packet contents */
...@@ -832,12 +832,12 @@ typedef struct hfa384x_usb_rmemreq { ...@@ -832,12 +832,12 @@ typedef struct hfa384x_usb_rmemreq {
typedef struct hfa384x_usb_rxfrm { typedef struct hfa384x_usb_rxfrm {
hfa384x_rx_frame_t desc; hfa384x_rx_frame_t desc;
u8 data[WLAN_DATA_MAXLEN]; u8 data[WLAN_DATA_MAXLEN];
} __attribute__ ((packed)) hfa384x_usb_rxfrm_t; } __packed hfa384x_usb_rxfrm_t;
typedef struct hfa384x_usb_infofrm { typedef struct hfa384x_usb_infofrm {
u16 type; u16 type;
hfa384x_InfFrame_t info; hfa384x_InfFrame_t info;
} __attribute__ ((packed)) hfa384x_usb_infofrm_t; } __packed hfa384x_usb_infofrm_t;
typedef struct hfa384x_usb_statusresp { typedef struct hfa384x_usb_statusresp {
u16 type; u16 type;
...@@ -845,7 +845,7 @@ typedef struct hfa384x_usb_statusresp { ...@@ -845,7 +845,7 @@ typedef struct hfa384x_usb_statusresp {
u16 resp0; u16 resp0;
u16 resp1; u16 resp1;
u16 resp2; u16 resp2;
} __attribute__ ((packed)) hfa384x_usb_cmdresp_t; } __packed hfa384x_usb_cmdresp_t;
typedef hfa384x_usb_cmdresp_t hfa384x_usb_wridresp_t; typedef hfa384x_usb_cmdresp_t hfa384x_usb_wridresp_t;
...@@ -854,7 +854,7 @@ typedef struct hfa384x_usb_rridresp { ...@@ -854,7 +854,7 @@ typedef struct hfa384x_usb_rridresp {
u16 frmlen; u16 frmlen;
u16 rid; u16 rid;
u8 data[HFA384x_RIDDATA_MAXLEN]; u8 data[HFA384x_RIDDATA_MAXLEN];
} __attribute__ ((packed)) hfa384x_usb_rridresp_t; } __packed hfa384x_usb_rridresp_t;
typedef hfa384x_usb_cmdresp_t hfa384x_usb_wmemresp_t; typedef hfa384x_usb_cmdresp_t hfa384x_usb_wmemresp_t;
...@@ -862,17 +862,17 @@ typedef struct hfa384x_usb_rmemresp { ...@@ -862,17 +862,17 @@ typedef struct hfa384x_usb_rmemresp {
u16 type; u16 type;
u16 frmlen; u16 frmlen;
u8 data[HFA384x_USB_RWMEM_MAXLEN]; u8 data[HFA384x_USB_RWMEM_MAXLEN];
} __attribute__ ((packed)) hfa384x_usb_rmemresp_t; } __packed hfa384x_usb_rmemresp_t;
typedef struct hfa384x_usb_bufavail { typedef struct hfa384x_usb_bufavail {
u16 type; u16 type;
u16 frmlen; u16 frmlen;
} __attribute__ ((packed)) hfa384x_usb_bufavail_t; } __packed hfa384x_usb_bufavail_t;
typedef struct hfa384x_usb_error { typedef struct hfa384x_usb_error {
u16 type; u16 type;
u16 errortype; u16 errortype;
} __attribute__ ((packed)) hfa384x_usb_error_t; } __packed hfa384x_usb_error_t;
/*----------------------------------------------------------*/ /*----------------------------------------------------------*/
/* Unions for packaging all the known packet types together */ /* Unions for packaging all the known packet types together */
...@@ -885,7 +885,7 @@ typedef union hfa384x_usbout { ...@@ -885,7 +885,7 @@ typedef union hfa384x_usbout {
hfa384x_usb_rridreq_t rridreq; hfa384x_usb_rridreq_t rridreq;
hfa384x_usb_wmemreq_t wmemreq; hfa384x_usb_wmemreq_t wmemreq;
hfa384x_usb_rmemreq_t rmemreq; hfa384x_usb_rmemreq_t rmemreq;
} __attribute__ ((packed)) hfa384x_usbout_t; } __packed hfa384x_usbout_t;
typedef union hfa384x_usbin { typedef union hfa384x_usbin {
u16 type; u16 type;
...@@ -900,7 +900,7 @@ typedef union hfa384x_usbin { ...@@ -900,7 +900,7 @@ typedef union hfa384x_usbin {
hfa384x_usb_bufavail_t bufavail; hfa384x_usb_bufavail_t bufavail;
hfa384x_usb_error_t usberror; hfa384x_usb_error_t usberror;
u8 boguspad[3000]; u8 boguspad[3000];
} __attribute__ ((packed)) hfa384x_usbin_t; } __packed hfa384x_usbin_t;
/*-------------------------------------------------------------------- /*--------------------------------------------------------------------
PD record structures. PD record structures.
...@@ -908,15 +908,15 @@ PD record structures. ...@@ -908,15 +908,15 @@ PD record structures.
typedef struct hfa384x_pdr_pcb_partnum { typedef struct hfa384x_pdr_pcb_partnum {
u8 num[8]; u8 num[8];
} __attribute__ ((packed)) hfa384x_pdr_pcb_partnum_t; } __packed hfa384x_pdr_pcb_partnum_t;
typedef struct hfa384x_pdr_pcb_tracenum { typedef struct hfa384x_pdr_pcb_tracenum {
u8 num[8]; u8 num[8];
} __attribute__ ((packed)) hfa384x_pdr_pcb_tracenum_t; } __packed hfa384x_pdr_pcb_tracenum_t;
typedef struct hfa384x_pdr_nic_serial { typedef struct hfa384x_pdr_nic_serial {
u8 num[12]; u8 num[12];
} __attribute__ ((packed)) hfa384x_pdr_nic_serial_t; } __packed hfa384x_pdr_nic_serial_t;
typedef struct hfa384x_pdr_mkk_measurements { typedef struct hfa384x_pdr_mkk_measurements {
double carrier_freq; double carrier_freq;
...@@ -934,138 +934,138 @@ typedef struct hfa384x_pdr_mkk_measurements { ...@@ -934,138 +934,138 @@ typedef struct hfa384x_pdr_mkk_measurements {
double rx_spur_f2; double rx_spur_f2;
double rx_spur_l1; double rx_spur_l1;
double rx_spur_l2; double rx_spur_l2;
} __attribute__ ((packed)) hfa384x_pdr_mkk_measurements_t; } __packed hfa384x_pdr_mkk_measurements_t;
typedef struct hfa384x_pdr_nic_ramsize { typedef struct hfa384x_pdr_nic_ramsize {
u8 size[12]; /* units of KB */ u8 size[12]; /* units of KB */
} __attribute__ ((packed)) hfa384x_pdr_nic_ramsize_t; } __packed hfa384x_pdr_nic_ramsize_t;
typedef struct hfa384x_pdr_mfisuprange { typedef struct hfa384x_pdr_mfisuprange {
u16 id; u16 id;
u16 variant; u16 variant;
u16 bottom; u16 bottom;
u16 top; u16 top;
} __attribute__ ((packed)) hfa384x_pdr_mfisuprange_t; } __packed hfa384x_pdr_mfisuprange_t;
typedef struct hfa384x_pdr_cfisuprange { typedef struct hfa384x_pdr_cfisuprange {
u16 id; u16 id;
u16 variant; u16 variant;
u16 bottom; u16 bottom;
u16 top; u16 top;
} __attribute__ ((packed)) hfa384x_pdr_cfisuprange_t; } __packed hfa384x_pdr_cfisuprange_t;
typedef struct hfa384x_pdr_nicid { typedef struct hfa384x_pdr_nicid {
u16 id; u16 id;
u16 variant; u16 variant;
u16 major; u16 major;
u16 minor; u16 minor;
} __attribute__ ((packed)) hfa384x_pdr_nicid_t; } __packed hfa384x_pdr_nicid_t;
typedef struct hfa384x_pdr_refdac_measurements { typedef struct hfa384x_pdr_refdac_measurements {
u16 value[0]; u16 value[0];
} __attribute__ ((packed)) hfa384x_pdr_refdac_measurements_t; } __packed hfa384x_pdr_refdac_measurements_t;
typedef struct hfa384x_pdr_vgdac_measurements { typedef struct hfa384x_pdr_vgdac_measurements {
u16 value[0]; u16 value[0];
} __attribute__ ((packed)) hfa384x_pdr_vgdac_measurements_t; } __packed hfa384x_pdr_vgdac_measurements_t;
typedef struct hfa384x_pdr_level_comp_measurements { typedef struct hfa384x_pdr_level_comp_measurements {
u16 value[0]; u16 value[0];
} __attribute__ ((packed)) hfa384x_pdr_level_compc_measurements_t; } __packed hfa384x_pdr_level_compc_measurements_t;
typedef struct hfa384x_pdr_mac_address { typedef struct hfa384x_pdr_mac_address {
u8 addr[6]; u8 addr[6];
} __attribute__ ((packed)) hfa384x_pdr_mac_address_t; } __packed hfa384x_pdr_mac_address_t;
typedef struct hfa384x_pdr_mkk_callname { typedef struct hfa384x_pdr_mkk_callname {
u8 callname[8]; u8 callname[8];
} __attribute__ ((packed)) hfa384x_pdr_mkk_callname_t; } __packed hfa384x_pdr_mkk_callname_t;
typedef struct hfa384x_pdr_regdomain { typedef struct hfa384x_pdr_regdomain {
u16 numdomains; u16 numdomains;
u16 domain[5]; u16 domain[5];
} __attribute__ ((packed)) hfa384x_pdr_regdomain_t; } __packed hfa384x_pdr_regdomain_t;
typedef struct hfa384x_pdr_allowed_channel { typedef struct hfa384x_pdr_allowed_channel {
u16 ch_bitmap; u16 ch_bitmap;
} __attribute__ ((packed)) hfa384x_pdr_allowed_channel_t; } __packed hfa384x_pdr_allowed_channel_t;
typedef struct hfa384x_pdr_default_channel { typedef struct hfa384x_pdr_default_channel {
u16 channel; u16 channel;
} __attribute__ ((packed)) hfa384x_pdr_default_channel_t; } __packed hfa384x_pdr_default_channel_t;
typedef struct hfa384x_pdr_privacy_option { typedef struct hfa384x_pdr_privacy_option {
u16 available; u16 available;
} __attribute__ ((packed)) hfa384x_pdr_privacy_option_t; } __packed hfa384x_pdr_privacy_option_t;
typedef struct hfa384x_pdr_temptype { typedef struct hfa384x_pdr_temptype {
u16 type; u16 type;
} __attribute__ ((packed)) hfa384x_pdr_temptype_t; } __packed hfa384x_pdr_temptype_t;
typedef struct hfa384x_pdr_refdac_setup { typedef struct hfa384x_pdr_refdac_setup {
u16 ch_value[14]; u16 ch_value[14];
} __attribute__ ((packed)) hfa384x_pdr_refdac_setup_t; } __packed hfa384x_pdr_refdac_setup_t;
typedef struct hfa384x_pdr_vgdac_setup { typedef struct hfa384x_pdr_vgdac_setup {
u16 ch_value[14]; u16 ch_value[14];
} __attribute__ ((packed)) hfa384x_pdr_vgdac_setup_t; } __packed hfa384x_pdr_vgdac_setup_t;
typedef struct hfa384x_pdr_level_comp_setup { typedef struct hfa384x_pdr_level_comp_setup {
u16 ch_value[14]; u16 ch_value[14];
} __attribute__ ((packed)) hfa384x_pdr_level_comp_setup_t; } __packed hfa384x_pdr_level_comp_setup_t;
typedef struct hfa384x_pdr_trimdac_setup { typedef struct hfa384x_pdr_trimdac_setup {
u16 trimidac; u16 trimidac;
u16 trimqdac; u16 trimqdac;
} __attribute__ ((packed)) hfa384x_pdr_trimdac_setup_t; } __packed hfa384x_pdr_trimdac_setup_t;
typedef struct hfa384x_pdr_ifr_setting { typedef struct hfa384x_pdr_ifr_setting {
u16 value[3]; u16 value[3];
} __attribute__ ((packed)) hfa384x_pdr_ifr_setting_t; } __packed hfa384x_pdr_ifr_setting_t;
typedef struct hfa384x_pdr_rfr_setting { typedef struct hfa384x_pdr_rfr_setting {
u16 value[3]; u16 value[3];
} __attribute__ ((packed)) hfa384x_pdr_rfr_setting_t; } __packed hfa384x_pdr_rfr_setting_t;
typedef struct hfa384x_pdr_hfa3861_baseline { typedef struct hfa384x_pdr_hfa3861_baseline {
u16 value[50]; u16 value[50];
} __attribute__ ((packed)) hfa384x_pdr_hfa3861_baseline_t; } __packed hfa384x_pdr_hfa3861_baseline_t;
typedef struct hfa384x_pdr_hfa3861_shadow { typedef struct hfa384x_pdr_hfa3861_shadow {
u32 value[32]; u32 value[32];
} __attribute__ ((packed)) hfa384x_pdr_hfa3861_shadow_t; } __packed hfa384x_pdr_hfa3861_shadow_t;
typedef struct hfa384x_pdr_hfa3861_ifrf { typedef struct hfa384x_pdr_hfa3861_ifrf {
u32 value[20]; u32 value[20];
} __attribute__ ((packed)) hfa384x_pdr_hfa3861_ifrf_t; } __packed hfa384x_pdr_hfa3861_ifrf_t;
typedef struct hfa384x_pdr_hfa3861_chcalsp { typedef struct hfa384x_pdr_hfa3861_chcalsp {
u16 value[14]; u16 value[14];
} __attribute__ ((packed)) hfa384x_pdr_hfa3861_chcalsp_t; } __packed hfa384x_pdr_hfa3861_chcalsp_t;
typedef struct hfa384x_pdr_hfa3861_chcali { typedef struct hfa384x_pdr_hfa3861_chcali {
u16 value[17]; u16 value[17];
} __attribute__ ((packed)) hfa384x_pdr_hfa3861_chcali_t; } __packed hfa384x_pdr_hfa3861_chcali_t;
typedef struct hfa384x_pdr_hfa3861_nic_config { typedef struct hfa384x_pdr_hfa3861_nic_config {
u16 config_bitmap; u16 config_bitmap;
} __attribute__ ((packed)) hfa384x_pdr_nic_config_t; } __packed hfa384x_pdr_nic_config_t;
typedef struct hfa384x_pdr_hfo_delay { typedef struct hfa384x_pdr_hfo_delay {
u8 hfo_delay; u8 hfo_delay;
} __attribute__ ((packed)) hfa384x_hfo_delay_t; } __packed hfa384x_hfo_delay_t;
typedef struct hfa384x_pdr_hfa3861_manf_testsp { typedef struct hfa384x_pdr_hfa3861_manf_testsp {
u16 value[30]; u16 value[30];
} __attribute__ ((packed)) hfa384x_pdr_hfa3861_manf_testsp_t; } __packed hfa384x_pdr_hfa3861_manf_testsp_t;
typedef struct hfa384x_pdr_hfa3861_manf_testi { typedef struct hfa384x_pdr_hfa3861_manf_testi {
u16 value[30]; u16 value[30];
} __attribute__ ((packed)) hfa384x_pdr_hfa3861_manf_testi_t; } __packed hfa384x_pdr_hfa3861_manf_testi_t;
typedef struct hfa384x_end_of_pda { typedef struct hfa384x_end_of_pda {
u16 crc; u16 crc;
} __attribute__ ((packed)) hfa384x_pdr_end_of_pda_t; } __packed hfa384x_pdr_end_of_pda_t;
typedef struct hfa384x_pdrec { typedef struct hfa384x_pdrec {
u16 len; /* in words */ u16 len; /* in words */
...@@ -1107,7 +1107,7 @@ typedef struct hfa384x_pdrec { ...@@ -1107,7 +1107,7 @@ typedef struct hfa384x_pdrec {
hfa384x_pdr_end_of_pda_t end_of_pda; hfa384x_pdr_end_of_pda_t end_of_pda;
} data; } data;
} __attribute__ ((packed)) hfa384x_pdrec_t; } __packed hfa384x_pdrec_t;
#ifdef __KERNEL__ #ifdef __KERNEL__
/*-------------------------------------------------------------------- /*--------------------------------------------------------------------
......
...@@ -134,20 +134,20 @@ struct wlan_ethhdr { ...@@ -134,20 +134,20 @@ struct wlan_ethhdr {
u8 daddr[WLAN_ETHADDR_LEN]; u8 daddr[WLAN_ETHADDR_LEN];
u8 saddr[WLAN_ETHADDR_LEN]; u8 saddr[WLAN_ETHADDR_LEN];
u16 type; u16 type;
} __attribute__ ((packed)); } __packed;
/* local llc header type */ /* local llc header type */
struct wlan_llc { struct wlan_llc {
u8 dsap; u8 dsap;
u8 ssap; u8 ssap;
u8 ctl; u8 ctl;
} __attribute__ ((packed)); } __packed;
/* local snap header type */ /* local snap header type */
struct wlan_snap { struct wlan_snap {
u8 oui[WLAN_IEEE_OUI_LEN]; u8 oui[WLAN_IEEE_OUI_LEN];
u16 type; u16 type;
} __attribute__ ((packed)); } __packed;
/* Circular include trick */ /* Circular include trick */
struct wlandevice; struct wlandevice;
......
...@@ -154,7 +154,7 @@ struct p80211_hdr_a3 { ...@@ -154,7 +154,7 @@ struct p80211_hdr_a3 {
u8 a2[ETH_ALEN]; u8 a2[ETH_ALEN];
u8 a3[ETH_ALEN]; u8 a3[ETH_ALEN];
u16 seq; u16 seq;
} __attribute__ ((packed)); } __packed;
struct p80211_hdr_a4 { struct p80211_hdr_a4 {
u16 fc; u16 fc;
...@@ -164,12 +164,12 @@ struct p80211_hdr_a4 { ...@@ -164,12 +164,12 @@ struct p80211_hdr_a4 {
u8 a3[ETH_ALEN]; u8 a3[ETH_ALEN];
u16 seq; u16 seq;
u8 a4[ETH_ALEN]; u8 a4[ETH_ALEN];
} __attribute__ ((packed)); } __packed;
union p80211_hdr { union p80211_hdr {
struct p80211_hdr_a3 a3; struct p80211_hdr_a3 a3;
struct p80211_hdr_a4 a4; struct p80211_hdr_a4 a4;
} __attribute__ ((packed)); } __packed;
/* Frame and header length macros */ /* Frame and header length macros */
......
...@@ -84,6 +84,6 @@ struct p80211ioctl_req { ...@@ -84,6 +84,6 @@ struct p80211ioctl_req {
u32 magic; u32 magic;
u16 len; u16 len;
u32 result; u32 result;
} __attribute__ ((packed)); } __packed;
#endif /* _P80211IOCTL_H */ #endif /* _P80211IOCTL_H */
...@@ -53,7 +53,7 @@ struct p80211msg_dot11req_mibget { ...@@ -53,7 +53,7 @@ struct p80211msg_dot11req_mibget {
u8 devname[WLAN_DEVNAMELEN_MAX]; u8 devname[WLAN_DEVNAMELEN_MAX];
p80211item_unk392_t mibattribute; p80211item_unk392_t mibattribute;
p80211item_uint32_t resultcode; p80211item_uint32_t resultcode;
} __attribute__ ((packed)); } __packed;
struct p80211msg_dot11req_mibset { struct p80211msg_dot11req_mibset {
u32 msgcode; u32 msgcode;
...@@ -61,7 +61,7 @@ struct p80211msg_dot11req_mibset { ...@@ -61,7 +61,7 @@ struct p80211msg_dot11req_mibset {
u8 devname[WLAN_DEVNAMELEN_MAX]; u8 devname[WLAN_DEVNAMELEN_MAX];
p80211item_unk392_t mibattribute; p80211item_unk392_t mibattribute;
p80211item_uint32_t resultcode; p80211item_uint32_t resultcode;
} __attribute__ ((packed)); } __packed;
struct p80211msg_dot11req_scan { struct p80211msg_dot11req_scan {
u32 msgcode; u32 msgcode;
...@@ -81,7 +81,7 @@ struct p80211msg_dot11req_scan { ...@@ -81,7 +81,7 @@ struct p80211msg_dot11req_scan {
p80211item_uint32_t resultcode; p80211item_uint32_t resultcode;
p80211item_uint32_t numbss; p80211item_uint32_t numbss;
p80211item_uint32_t append; p80211item_uint32_t append;
} __attribute__ ((packed)); } __packed;
struct p80211msg_dot11req_scan_results { struct p80211msg_dot11req_scan_results {
u32 msgcode; u32 msgcode;
...@@ -130,7 +130,7 @@ struct p80211msg_dot11req_scan_results { ...@@ -130,7 +130,7 @@ struct p80211msg_dot11req_scan_results {
p80211item_uint32_t supprate6; p80211item_uint32_t supprate6;
p80211item_uint32_t supprate7; p80211item_uint32_t supprate7;
p80211item_uint32_t supprate8; p80211item_uint32_t supprate8;
} __attribute__ ((packed)); } __packed;
struct p80211msg_dot11req_start { struct p80211msg_dot11req_start {
u32 msgcode; u32 msgcode;
...@@ -168,7 +168,7 @@ struct p80211msg_dot11req_start { ...@@ -168,7 +168,7 @@ struct p80211msg_dot11req_start {
p80211item_uint32_t operationalrate7; p80211item_uint32_t operationalrate7;
p80211item_uint32_t operationalrate8; p80211item_uint32_t operationalrate8;
p80211item_uint32_t resultcode; p80211item_uint32_t resultcode;
} __attribute__ ((packed)); } __packed;
struct p80211msg_lnxreq_ifstate { struct p80211msg_lnxreq_ifstate {
u32 msgcode; u32 msgcode;
...@@ -176,7 +176,7 @@ struct p80211msg_lnxreq_ifstate { ...@@ -176,7 +176,7 @@ struct p80211msg_lnxreq_ifstate {
u8 devname[WLAN_DEVNAMELEN_MAX]; u8 devname[WLAN_DEVNAMELEN_MAX];
p80211item_uint32_t ifstate; p80211item_uint32_t ifstate;
p80211item_uint32_t resultcode; p80211item_uint32_t resultcode;
} __attribute__ ((packed)); } __packed;
struct p80211msg_lnxreq_wlansniff { struct p80211msg_lnxreq_wlansniff {
u32 msgcode; u32 msgcode;
...@@ -190,7 +190,7 @@ struct p80211msg_lnxreq_wlansniff { ...@@ -190,7 +190,7 @@ struct p80211msg_lnxreq_wlansniff {
p80211item_uint32_t stripfcs; p80211item_uint32_t stripfcs;
p80211item_uint32_t packet_trunc; p80211item_uint32_t packet_trunc;
p80211item_uint32_t resultcode; p80211item_uint32_t resultcode;
} __attribute__ ((packed)); } __packed;
struct p80211msg_lnxreq_hostwep { struct p80211msg_lnxreq_hostwep {
u32 msgcode; u32 msgcode;
...@@ -199,7 +199,7 @@ struct p80211msg_lnxreq_hostwep { ...@@ -199,7 +199,7 @@ struct p80211msg_lnxreq_hostwep {
p80211item_uint32_t resultcode; p80211item_uint32_t resultcode;
p80211item_uint32_t decrypt; p80211item_uint32_t decrypt;
p80211item_uint32_t encrypt; p80211item_uint32_t encrypt;
} __attribute__ ((packed)); } __packed;
struct p80211msg_lnxreq_commsquality { struct p80211msg_lnxreq_commsquality {
u32 msgcode; u32 msgcode;
...@@ -211,7 +211,7 @@ struct p80211msg_lnxreq_commsquality { ...@@ -211,7 +211,7 @@ struct p80211msg_lnxreq_commsquality {
p80211item_uint32_t level; p80211item_uint32_t level;
p80211item_uint32_t noise; p80211item_uint32_t noise;
p80211item_uint32_t txrate; p80211item_uint32_t txrate;
} __attribute__ ((packed)); } __packed;
struct p80211msg_lnxreq_autojoin { struct p80211msg_lnxreq_autojoin {
u32 msgcode; u32 msgcode;
...@@ -221,7 +221,7 @@ struct p80211msg_lnxreq_autojoin { ...@@ -221,7 +221,7 @@ struct p80211msg_lnxreq_autojoin {
u8 pad_19D[3]; u8 pad_19D[3];
p80211item_uint32_t authtype; p80211item_uint32_t authtype;
p80211item_uint32_t resultcode; p80211item_uint32_t resultcode;
} __attribute__ ((packed)); } __packed;
struct p80211msg_p2req_readpda { struct p80211msg_p2req_readpda {
u32 msgcode; u32 msgcode;
...@@ -229,7 +229,7 @@ struct p80211msg_p2req_readpda { ...@@ -229,7 +229,7 @@ struct p80211msg_p2req_readpda {
u8 devname[WLAN_DEVNAMELEN_MAX]; u8 devname[WLAN_DEVNAMELEN_MAX];
p80211item_unk1024_t pda; p80211item_unk1024_t pda;
p80211item_uint32_t resultcode; p80211item_uint32_t resultcode;
} __attribute__ ((packed)); } __packed;
struct p80211msg_p2req_ramdl_state { struct p80211msg_p2req_ramdl_state {
u32 msgcode; u32 msgcode;
...@@ -238,7 +238,7 @@ struct p80211msg_p2req_ramdl_state { ...@@ -238,7 +238,7 @@ struct p80211msg_p2req_ramdl_state {
p80211item_uint32_t enable; p80211item_uint32_t enable;
p80211item_uint32_t exeaddr; p80211item_uint32_t exeaddr;
p80211item_uint32_t resultcode; p80211item_uint32_t resultcode;
} __attribute__ ((packed)); } __packed;
struct p80211msg_p2req_ramdl_write { struct p80211msg_p2req_ramdl_write {
u32 msgcode; u32 msgcode;
...@@ -248,7 +248,7 @@ struct p80211msg_p2req_ramdl_write { ...@@ -248,7 +248,7 @@ struct p80211msg_p2req_ramdl_write {
p80211item_uint32_t len; p80211item_uint32_t len;
p80211item_unk4096_t data; p80211item_unk4096_t data;
p80211item_uint32_t resultcode; p80211item_uint32_t resultcode;
} __attribute__ ((packed)); } __packed;
struct p80211msg_p2req_flashdl_state { struct p80211msg_p2req_flashdl_state {
u32 msgcode; u32 msgcode;
...@@ -256,7 +256,7 @@ struct p80211msg_p2req_flashdl_state { ...@@ -256,7 +256,7 @@ struct p80211msg_p2req_flashdl_state {
u8 devname[WLAN_DEVNAMELEN_MAX]; u8 devname[WLAN_DEVNAMELEN_MAX];
p80211item_uint32_t enable; p80211item_uint32_t enable;
p80211item_uint32_t resultcode; p80211item_uint32_t resultcode;
} __attribute__ ((packed)); } __packed;
struct p80211msg_p2req_flashdl_write { struct p80211msg_p2req_flashdl_write {
u32 msgcode; u32 msgcode;
...@@ -266,6 +266,6 @@ struct p80211msg_p2req_flashdl_write { ...@@ -266,6 +266,6 @@ struct p80211msg_p2req_flashdl_write {
p80211item_uint32_t len; p80211item_uint32_t len;
p80211item_unk4096_t data; p80211item_unk4096_t data;
p80211item_uint32_t resultcode; p80211item_uint32_t resultcode;
} __attribute__ ((packed)); } __packed;
#endif #endif
...@@ -222,21 +222,21 @@ ...@@ -222,21 +222,21 @@
typedef struct wlan_ie { typedef struct wlan_ie {
u8 eid; u8 eid;
u8 len; u8 len;
} __attribute__ ((packed)) wlan_ie_t; } __packed wlan_ie_t;
/*-- Service Set Identity (SSID) -----------------*/ /*-- Service Set Identity (SSID) -----------------*/
typedef struct wlan_ie_ssid { typedef struct wlan_ie_ssid {
u8 eid; u8 eid;
u8 len; u8 len;
u8 ssid[1]; /* may be zero, ptrs may overlap */ u8 ssid[1]; /* may be zero, ptrs may overlap */
} __attribute__ ((packed)) wlan_ie_ssid_t; } __packed wlan_ie_ssid_t;
/*-- Supported Rates -----------------------------*/ /*-- Supported Rates -----------------------------*/
typedef struct wlan_ie_supp_rates { typedef struct wlan_ie_supp_rates {
u8 eid; u8 eid;
u8 len; u8 len;
u8 rates[1]; /* had better be at LEAST one! */ u8 rates[1]; /* had better be at LEAST one! */
} __attribute__ ((packed)) wlan_ie_supp_rates_t; } __packed wlan_ie_supp_rates_t;
/*-- FH Parameter Set ----------------------------*/ /*-- FH Parameter Set ----------------------------*/
typedef struct wlan_ie_fh_parms { typedef struct wlan_ie_fh_parms {
...@@ -246,14 +246,14 @@ typedef struct wlan_ie_fh_parms { ...@@ -246,14 +246,14 @@ typedef struct wlan_ie_fh_parms {
u8 hopset; u8 hopset;
u8 hoppattern; u8 hoppattern;
u8 hopindex; u8 hopindex;
} __attribute__ ((packed)) wlan_ie_fh_parms_t; } __packed wlan_ie_fh_parms_t;
/*-- DS Parameter Set ----------------------------*/ /*-- DS Parameter Set ----------------------------*/
typedef struct wlan_ie_ds_parms { typedef struct wlan_ie_ds_parms {
u8 eid; u8 eid;
u8 len; u8 len;
u8 curr_ch; u8 curr_ch;
} __attribute__ ((packed)) wlan_ie_ds_parms_t; } __packed wlan_ie_ds_parms_t;
/*-- CF Parameter Set ----------------------------*/ /*-- CF Parameter Set ----------------------------*/
...@@ -264,7 +264,7 @@ typedef struct wlan_ie_cf_parms { ...@@ -264,7 +264,7 @@ typedef struct wlan_ie_cf_parms {
u8 cfp_period; u8 cfp_period;
u16 cfp_maxdur; u16 cfp_maxdur;
u16 cfp_durremaining; u16 cfp_durremaining;
} __attribute__ ((packed)) wlan_ie_cf_parms_t; } __packed wlan_ie_cf_parms_t;
/*-- TIM ------------------------------------------*/ /*-- TIM ------------------------------------------*/
typedef struct wlan_ie_tim { typedef struct wlan_ie_tim {
...@@ -274,21 +274,21 @@ typedef struct wlan_ie_tim { ...@@ -274,21 +274,21 @@ typedef struct wlan_ie_tim {
u8 dtim_period; u8 dtim_period;
u8 bitmap_ctl; u8 bitmap_ctl;
u8 virt_bm[1]; u8 virt_bm[1];
} __attribute__ ((packed)) wlan_ie_tim_t; } __packed wlan_ie_tim_t;
/*-- IBSS Parameter Set ---------------------------*/ /*-- IBSS Parameter Set ---------------------------*/
typedef struct wlan_ie_ibss_parms { typedef struct wlan_ie_ibss_parms {
u8 eid; u8 eid;
u8 len; u8 len;
u16 atim_win; u16 atim_win;
} __attribute__ ((packed)) wlan_ie_ibss_parms_t; } __packed wlan_ie_ibss_parms_t;
/*-- Challenge Text ------------------------------*/ /*-- Challenge Text ------------------------------*/
typedef struct wlan_ie_challenge { typedef struct wlan_ie_challenge {
u8 eid; u8 eid;
u8 len; u8 len;
u8 challenge[1]; u8 challenge[1];
} __attribute__ ((packed)) wlan_ie_challenge_t; } __packed wlan_ie_challenge_t;
/*-------------------------------------------------*/ /*-------------------------------------------------*/
/* Frame Types */ /* Frame Types */
......
...@@ -54,6 +54,6 @@ struct p80211msg { ...@@ -54,6 +54,6 @@ struct p80211msg {
u32 msgcode; u32 msgcode;
u32 msglen; u32 msglen;
u8 devname[WLAN_DEVNAMELEN_MAX]; u8 devname[WLAN_DEVNAMELEN_MAX];
} __attribute__ ((packed)); } __packed;
#endif /* _P80211MSG_H */ #endif /* _P80211MSG_H */
...@@ -217,49 +217,49 @@ typedef struct p80211enum { ...@@ -217,49 +217,49 @@ typedef struct p80211enum {
/* Template pascal string */ /* Template pascal string */
typedef struct p80211pstr { typedef struct p80211pstr {
u8 len; u8 len;
} __attribute__ ((packed)) p80211pstr_t; } __packed p80211pstr_t;
typedef struct p80211pstrd { typedef struct p80211pstrd {
u8 len; u8 len;
u8 data[0]; u8 data[0];
} __attribute__ ((packed)) p80211pstrd_t; } __packed p80211pstrd_t;
/* Maximum pascal string */ /* Maximum pascal string */
typedef struct p80211pstr255 { typedef struct p80211pstr255 {
u8 len; u8 len;
u8 data[MAXLEN_PSTR255]; u8 data[MAXLEN_PSTR255];
} __attribute__ ((packed)) p80211pstr255_t; } __packed p80211pstr255_t;
/* pascal string for macaddress and bssid */ /* pascal string for macaddress and bssid */
typedef struct p80211pstr6 { typedef struct p80211pstr6 {
u8 len; u8 len;
u8 data[MAXLEN_PSTR6]; u8 data[MAXLEN_PSTR6];
} __attribute__ ((packed)) p80211pstr6_t; } __packed p80211pstr6_t;
/* pascal string for channel list */ /* pascal string for channel list */
typedef struct p80211pstr14 { typedef struct p80211pstr14 {
u8 len; u8 len;
u8 data[MAXLEN_PSTR14]; u8 data[MAXLEN_PSTR14];
} __attribute__ ((packed)) p80211pstr14_t; } __packed p80211pstr14_t;
/* pascal string for ssid */ /* pascal string for ssid */
typedef struct p80211pstr32 { typedef struct p80211pstr32 {
u8 len; u8 len;
u8 data[MAXLEN_PSTR32]; u8 data[MAXLEN_PSTR32];
} __attribute__ ((packed)) p80211pstr32_t; } __packed p80211pstr32_t;
/* MAC address array */ /* MAC address array */
typedef struct p80211macarray { typedef struct p80211macarray {
u32 cnt; u32 cnt;
u8 data[1][MAXLEN_PSTR6]; u8 data[1][MAXLEN_PSTR6];
} __attribute__ ((packed)) p80211macarray_t; } __packed p80211macarray_t;
/* prototype template */ /* prototype template */
typedef struct p80211item { typedef struct p80211item {
u32 did; u32 did;
u16 status; u16 status;
u16 len; u16 len;
} __attribute__ ((packed)) p80211item_t; } __packed p80211item_t;
/* prototype template w/ data item */ /* prototype template w/ data item */
typedef struct p80211itemd { typedef struct p80211itemd {
...@@ -267,7 +267,7 @@ typedef struct p80211itemd { ...@@ -267,7 +267,7 @@ typedef struct p80211itemd {
u16 status; u16 status;
u16 len; u16 len;
u8 data[0]; u8 data[0];
} __attribute__ ((packed)) p80211itemd_t; } __packed p80211itemd_t;
/* message data item for int, BOUNDEDINT, ENUMINT */ /* message data item for int, BOUNDEDINT, ENUMINT */
typedef struct p80211item_uint32 { typedef struct p80211item_uint32 {
...@@ -275,7 +275,7 @@ typedef struct p80211item_uint32 { ...@@ -275,7 +275,7 @@ typedef struct p80211item_uint32 {
u16 status; u16 status;
u16 len; u16 len;
u32 data; u32 data;
} __attribute__ ((packed)) p80211item_uint32_t; } __packed p80211item_uint32_t;
/* message data item for OCTETSTR, DISPLAYSTR */ /* message data item for OCTETSTR, DISPLAYSTR */
typedef struct p80211item_pstr6 { typedef struct p80211item_pstr6 {
...@@ -283,7 +283,7 @@ typedef struct p80211item_pstr6 { ...@@ -283,7 +283,7 @@ typedef struct p80211item_pstr6 {
u16 status; u16 status;
u16 len; u16 len;
p80211pstr6_t data; p80211pstr6_t data;
} __attribute__ ((packed)) p80211item_pstr6_t; } __packed p80211item_pstr6_t;
/* message data item for OCTETSTR, DISPLAYSTR */ /* message data item for OCTETSTR, DISPLAYSTR */
typedef struct p80211item_pstr14 { typedef struct p80211item_pstr14 {
...@@ -291,7 +291,7 @@ typedef struct p80211item_pstr14 { ...@@ -291,7 +291,7 @@ typedef struct p80211item_pstr14 {
u16 status; u16 status;
u16 len; u16 len;
p80211pstr14_t data; p80211pstr14_t data;
} __attribute__ ((packed)) p80211item_pstr14_t; } __packed p80211item_pstr14_t;
/* message data item for OCTETSTR, DISPLAYSTR */ /* message data item for OCTETSTR, DISPLAYSTR */
typedef struct p80211item_pstr32 { typedef struct p80211item_pstr32 {
...@@ -299,7 +299,7 @@ typedef struct p80211item_pstr32 { ...@@ -299,7 +299,7 @@ typedef struct p80211item_pstr32 {
u16 status; u16 status;
u16 len; u16 len;
p80211pstr32_t data; p80211pstr32_t data;
} __attribute__ ((packed)) p80211item_pstr32_t; } __packed p80211item_pstr32_t;
/* message data item for OCTETSTR, DISPLAYSTR */ /* message data item for OCTETSTR, DISPLAYSTR */
typedef struct p80211item_pstr255 { typedef struct p80211item_pstr255 {
...@@ -307,7 +307,7 @@ typedef struct p80211item_pstr255 { ...@@ -307,7 +307,7 @@ typedef struct p80211item_pstr255 {
u16 status; u16 status;
u16 len; u16 len;
p80211pstr255_t data; p80211pstr255_t data;
} __attribute__ ((packed)) p80211item_pstr255_t; } __packed p80211item_pstr255_t;
/* message data item for UNK 392, namely mib items */ /* message data item for UNK 392, namely mib items */
typedef struct p80211item_unk392 { typedef struct p80211item_unk392 {
...@@ -315,7 +315,7 @@ typedef struct p80211item_unk392 { ...@@ -315,7 +315,7 @@ typedef struct p80211item_unk392 {
u16 status; u16 status;
u16 len; u16 len;
u8 data[MAXLEN_MIBATTRIBUTE]; u8 data[MAXLEN_MIBATTRIBUTE];
} __attribute__ ((packed)) p80211item_unk392_t; } __packed p80211item_unk392_t;
/* message data item for UNK 1025, namely p2 pdas */ /* message data item for UNK 1025, namely p2 pdas */
typedef struct p80211item_unk1024 { typedef struct p80211item_unk1024 {
...@@ -323,7 +323,7 @@ typedef struct p80211item_unk1024 { ...@@ -323,7 +323,7 @@ typedef struct p80211item_unk1024 {
u16 status; u16 status;
u16 len; u16 len;
u8 data[1024]; u8 data[1024];
} __attribute__ ((packed)) p80211item_unk1024_t; } __packed p80211item_unk1024_t;
/* message data item for UNK 4096, namely p2 download chunks */ /* message data item for UNK 4096, namely p2 download chunks */
typedef struct p80211item_unk4096 { typedef struct p80211item_unk4096 {
...@@ -331,7 +331,7 @@ typedef struct p80211item_unk4096 { ...@@ -331,7 +331,7 @@ typedef struct p80211item_unk4096 {
u16 status; u16 status;
u16 len; u16 len;
u8 data[4096]; u8 data[4096];
} __attribute__ ((packed)) p80211item_unk4096_t; } __packed p80211item_unk4096_t;
struct catlistitem; struct catlistitem;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment