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

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

Staging: wlan-ng: Remove use of __WLAN_ATTRIB_PACK__ 



Replace all ocurrances of the __WLAN_ATTRIB_PACK__ from wlan_compat.h
by __attribute__((packed)) and remove it afterwards.

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

drivers/staging/wlan-ng/hfa384x.h

+155 −155

File changed.

Preview size limit exceeded, changes collapsed.

drivers/staging/wlan-ng/p80211conv.h

+3 −3
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ typedef struct wlan_ethhdr 
	u8	daddr[WLAN_ETHADDR_LEN];

	u8	saddr[WLAN_ETHADDR_LEN];

	u16	type;

} __WLAN_ATTRIB_PACK__ wlan_ethhdr_t;

} __attribute__((packed)) wlan_ethhdr_t;



/* local llc header type */

typedef struct wlan_llc
@@ -156,14 +156,14 @@ typedef struct wlan_llc 
	u8	dsap;

	u8	ssap;

	u8	ctl;

} __WLAN_ATTRIB_PACK__ wlan_llc_t;

} __attribute__((packed)) wlan_llc_t;



/* local snap header type */

typedef struct wlan_snap

{

	u8	oui[WLAN_IEEE_OUI_LEN];

	u16	type;

} __WLAN_ATTRIB_PACK__ wlan_snap_t;

} __attribute__((packed)) wlan_snap_t;



/* Circular include trick */

struct wlandevice;

drivers/staging/wlan-ng/p80211hdr.h

+3 −3
Original line number Diff line number Diff line
@@ -229,7 +229,7 @@ typedef struct p80211_hdr_a3 
	u8	a2[WLAN_ADDR_LEN];

	u8	a3[WLAN_ADDR_LEN];

	u16	seq;

} __WLAN_ATTRIB_PACK__ p80211_hdr_a3_t;

} __attribute__((packed)) p80211_hdr_a3_t;



typedef struct p80211_hdr_a4

{
@@ -240,13 +240,13 @@ typedef struct p80211_hdr_a4 
	u8	a3[WLAN_ADDR_LEN];

	u16	seq;

	u8	a4[WLAN_ADDR_LEN];

} __WLAN_ATTRIB_PACK__ p80211_hdr_a4_t;

} __attribute__((packed)) p80211_hdr_a4_t;



typedef union p80211_hdr

{

	p80211_hdr_a3_t		a3;

	p80211_hdr_a4_t		a4;

} __WLAN_ATTRIB_PACK__ p80211_hdr_t;

} __attribute__((packed)) p80211_hdr_t;





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

drivers/staging/wlan-ng/p80211ioctl.h

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ typedef struct p80211ioctl_req 
	u32	magic;

	u16	len;

	u32	result;

} __WLAN_ATTRIB_PACK__ p80211ioctl_req_t;

} __attribute__((packed)) p80211ioctl_req_t;





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

drivers/staging/wlan-ng/p80211metastruct.h

+15 −15
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ typedef struct p80211msg_dot11req_mibget 
	u8		devname[WLAN_DEVNAMELEN_MAX]	;

	p80211item_unk392_t	mibattribute	;

	p80211item_uint32_t	resultcode	;

} __WLAN_ATTRIB_PACK__ p80211msg_dot11req_mibget_t;

} __attribute__((packed)) p80211msg_dot11req_mibget_t;



typedef struct p80211msg_dot11req_mibset

{
@@ -64,7 +64,7 @@ typedef struct p80211msg_dot11req_mibset 
	u8		devname[WLAN_DEVNAMELEN_MAX]	;

	p80211item_unk392_t	mibattribute	;

	p80211item_uint32_t	resultcode	;

} __WLAN_ATTRIB_PACK__ p80211msg_dot11req_mibset_t;

} __attribute__((packed)) p80211msg_dot11req_mibset_t;



typedef struct p80211msg_dot11req_scan

{
@@ -85,7 +85,7 @@ typedef struct p80211msg_dot11req_scan 
	p80211item_uint32_t	resultcode	;

	p80211item_uint32_t	numbss	;

	p80211item_uint32_t	append	;

} __WLAN_ATTRIB_PACK__ p80211msg_dot11req_scan_t;

} __attribute__((packed)) p80211msg_dot11req_scan_t;



typedef struct p80211msg_dot11req_scan_results

{
@@ -134,7 +134,7 @@ typedef struct p80211msg_dot11req_scan_results 
	p80211item_uint32_t	supprate6	;

	p80211item_uint32_t	supprate7	;

	p80211item_uint32_t	supprate8	;

} __WLAN_ATTRIB_PACK__ p80211msg_dot11req_scan_results_t;

} __attribute__((packed)) p80211msg_dot11req_scan_results_t;



typedef struct p80211msg_dot11req_start

{
@@ -173,7 +173,7 @@ typedef struct p80211msg_dot11req_start 
	p80211item_uint32_t	operationalrate7	;

	p80211item_uint32_t	operationalrate8	;

	p80211item_uint32_t	resultcode	;

} __WLAN_ATTRIB_PACK__ p80211msg_dot11req_start_t;

} __attribute__((packed)) p80211msg_dot11req_start_t;



typedef struct p80211msg_lnxreq_ifstate

{
@@ -182,7 +182,7 @@ typedef struct p80211msg_lnxreq_ifstate 
	u8		devname[WLAN_DEVNAMELEN_MAX]	;

	p80211item_uint32_t	ifstate	;

	p80211item_uint32_t	resultcode	;

} __WLAN_ATTRIB_PACK__ p80211msg_lnxreq_ifstate_t;

} __attribute__((packed)) p80211msg_lnxreq_ifstate_t;



typedef struct p80211msg_lnxreq_wlansniff

{
@@ -197,7 +197,7 @@ typedef struct p80211msg_lnxreq_wlansniff 
	p80211item_uint32_t	stripfcs	;

	p80211item_uint32_t	packet_trunc	;

	p80211item_uint32_t	resultcode	;

} __WLAN_ATTRIB_PACK__ p80211msg_lnxreq_wlansniff_t;

} __attribute__((packed)) p80211msg_lnxreq_wlansniff_t;



typedef struct p80211msg_lnxreq_hostwep

{
@@ -207,7 +207,7 @@ typedef struct p80211msg_lnxreq_hostwep 
	p80211item_uint32_t	resultcode	;

	p80211item_uint32_t	decrypt	;

	p80211item_uint32_t	encrypt	;

} __WLAN_ATTRIB_PACK__ p80211msg_lnxreq_hostwep_t;

} __attribute__((packed)) p80211msg_lnxreq_hostwep_t;



typedef struct p80211msg_lnxreq_commsquality

{
@@ -219,7 +219,7 @@ typedef struct p80211msg_lnxreq_commsquality 
	p80211item_uint32_t	link	;

	p80211item_uint32_t	level	;

	p80211item_uint32_t	noise	;

} __WLAN_ATTRIB_PACK__ p80211msg_lnxreq_commsquality_t;

} __attribute__((packed)) p80211msg_lnxreq_commsquality_t;



typedef struct p80211msg_lnxreq_autojoin

{
@@ -230,7 +230,7 @@ typedef struct p80211msg_lnxreq_autojoin 
	u8	pad_19D[3]	;

	p80211item_uint32_t	authtype	;

	p80211item_uint32_t	resultcode	;

} __WLAN_ATTRIB_PACK__ p80211msg_lnxreq_autojoin_t;

} __attribute__((packed)) p80211msg_lnxreq_autojoin_t;



typedef struct p80211msg_p2req_readpda

{
@@ -239,7 +239,7 @@ typedef struct p80211msg_p2req_readpda 
	u8		devname[WLAN_DEVNAMELEN_MAX]	;

	p80211item_unk1024_t	pda	;

	p80211item_uint32_t	resultcode	;

} __WLAN_ATTRIB_PACK__ p80211msg_p2req_readpda_t;

} __attribute__((packed)) p80211msg_p2req_readpda_t;



typedef struct p80211msg_p2req_ramdl_state

{
@@ -249,7 +249,7 @@ typedef struct p80211msg_p2req_ramdl_state 
	p80211item_uint32_t	enable	;

	p80211item_uint32_t	exeaddr	;

	p80211item_uint32_t	resultcode	;

} __WLAN_ATTRIB_PACK__ p80211msg_p2req_ramdl_state_t;

} __attribute__((packed)) p80211msg_p2req_ramdl_state_t;



typedef struct p80211msg_p2req_ramdl_write

{
@@ -260,7 +260,7 @@ typedef struct p80211msg_p2req_ramdl_write 
	p80211item_uint32_t	len	;

	p80211item_unk4096_t	data	;

	p80211item_uint32_t	resultcode	;

} __WLAN_ATTRIB_PACK__ p80211msg_p2req_ramdl_write_t;

} __attribute__((packed)) p80211msg_p2req_ramdl_write_t;



typedef struct p80211msg_p2req_flashdl_state

{
@@ -269,7 +269,7 @@ typedef struct p80211msg_p2req_flashdl_state 
	u8		devname[WLAN_DEVNAMELEN_MAX]	;

	p80211item_uint32_t	enable	;

	p80211item_uint32_t	resultcode	;

} __WLAN_ATTRIB_PACK__ p80211msg_p2req_flashdl_state_t;

} __attribute__((packed)) p80211msg_p2req_flashdl_state_t;



typedef struct p80211msg_p2req_flashdl_write

{
@@ -280,6 +280,6 @@ typedef struct p80211msg_p2req_flashdl_write 
	p80211item_uint32_t	len	;

	p80211item_unk4096_t	data	;

	p80211item_uint32_t	resultcode	;

} __WLAN_ATTRIB_PACK__ p80211msg_p2req_flashdl_write_t;

} __attribute__((packed)) p80211msg_p2req_flashdl_write_t;



#endif