s/__attribute__((__packed__))/__packed/

4 files changed, 34 insertions, 34 deletions

diff --git a/sys/dev/pci/if_ipwreg.h b/sys/dev/pci/if_ipwreg.h
index a4dd1507c44..2d9449cfc19 100644
--- a/sys/dev/pci/if_ipwreg.h
+++ b/sys/dev/pci/if_ipwreg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ipwreg.h,v 1.12 2005/03/12 13:23:30 damien Exp $	*/
+/*	$OpenBSD: if_ipwreg.h,v 1.13 2005/03/12 13:31:26 damien Exp $	*/
 
 /*-
  * Copyright (c) 2004, 2005
@@ -118,7 +118,7 @@ struct ipw_firmware_hdr {
 	u_int32_t	version;
 	u_int32_t	main_size;	/* firmware size */
 	u_int32_t	ucode_size;	/* microcode size */
-} __attribute__((__packed__));
+} __packed;
 
 /* buffer descriptor */
 struct ipw_bd {
@@ -132,7 +132,7 @@ struct ipw_bd {
 #define IPW_BD_FLAG_TX_LAST_FRAGMENT		0x08
 	u_int8_t	nfrag;	/* number of fragments */
 	u_int8_t	reserved[6];
-} __attribute__((__packed__));
+} __packed;
 
 /* status */
 struct ipw_status {
@@ -147,7 +147,7 @@ struct ipw_status {
 #define IPW_STATUS_FLAG_DECRYPTED	0x01
 #define IPW_STATUS_FLAG_WEP_ENCRYPTED	0x02
 	u_int8_t	rssi;	/* received signal strength indicator */
-} __attribute__((__packed__));
+} __packed;
 
 /* data header */
 struct ipw_hdr {
@@ -163,7 +163,7 @@ struct ipw_hdr {
 	u_int8_t	src_addr[IEEE80211_ADDR_LEN];
 	u_int8_t	dst_addr[IEEE80211_ADDR_LEN];
 	u_int16_t	fragmentsz;
-} __attribute__((__packed__));
+} __packed;
 
 /* command */
 struct ipw_cmd {
@@ -199,7 +199,7 @@ struct ipw_cmd {
 	u_int8_t	data[400];
 	u_int32_t	status;
 	u_int8_t	reserved[68];
-} __attribute__((__packed__));
+} __packed;
 
 /* possible values for command IPW_CMD_SET_POWER_MODE */
 #define IPW_POWER_MODE_CAM	0
@@ -218,7 +218,7 @@ struct ipw_wep_key {
 	u_int8_t	idx;
 	u_int8_t	len;
 	u_int8_t	key[13];
-} __attribute__((__packed__));
+} __packed;
 
 /* structure for command IPW_CMD_SET_SECURITY_INFORMATION */
 struct ipw_security {
@@ -231,7 +231,7 @@ struct ipw_security {
 #define IPW_AUTH_OPEN	0
 #define IPW_AUTH_SHARED	1
 	u_int16_t	reserved2;
-} __attribute__((__packed__));
+} __packed;
 
 /* structure for command IPW_CMD_SET_SCAN_OPTIONS */
 struct ipw_scan_options {
@@ -239,7 +239,7 @@ struct ipw_scan_options {
 #define IPW_SCAN_DO_NOT_ASSOCIATE	0x00000001
 #define IPW_SCAN_PASSIVE		0x00000008
 	u_int32_t	channels;
-} __attribute__((__packed__));
+} __packed;
 
 /* structure for command IPW_CMD_SET_CONFIGURATION */
 struct ipw_configuration {
@@ -252,7 +252,7 @@ struct ipw_configuration {
 #define IPW_CFG_IBSS_MASK	0x00010000
 	u_int32_t	bss_chan;
 	u_int32_t	ibss_chan;
-} __attribute__((__packed__));
+} __packed;
 
 /* EEPROM = Electrically Erasable Programmable Read-Only Memory */
 
diff --git a/sys/dev/pci/if_ipwvar.h b/sys/dev/pci/if_ipwvar.h
index 06f47c52066..34920eae745 100644
--- a/sys/dev/pci/if_ipwvar.h
+++ b/sys/dev/pci/if_ipwvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ipwvar.h,v 1.10 2005/03/01 19:30:38 damien Exp $	*/
+/*	$OpenBSD: if_ipwvar.h,v 1.11 2005/03/12 13:31:26 damien Exp $	*/
 
 /*-
  * Copyright (c) 2004, 2005
@@ -64,7 +64,7 @@ struct ipw_rx_radiotap_header {
 	u_int16_t	wr_chan_freq;
 	u_int16_t	wr_chan_flags;
 	u_int8_t	wr_antsignal;
-} __attribute__((__packed__));
+} __packed;
 
 #define IPW_RX_RADIOTAP_PRESENT						\
 	((1 << IEEE80211_RADIOTAP_FLAGS) |				\
@@ -76,7 +76,7 @@ struct ipw_tx_radiotap_header {
 	u_int8_t	wt_flags;
 	u_int16_t	wt_chan_freq;
 	u_int16_t	wt_chan_flags;
-} __attribute__((__packed__));
+} __packed;
 
 #define IPW_TX_RADIOTAP_PRESENT						\
 	((1 << IEEE80211_RADIOTAP_FLAGS) |				\
diff --git a/sys/dev/pci/if_iwireg.h b/sys/dev/pci/if_iwireg.h
index 17738e66e63..cc9e60ec9cf 100644
--- a/sys/dev/pci/if_iwireg.h
+++ b/sys/dev/pci/if_iwireg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_iwireg.h,v 1.11 2005/01/09 16:47:50 damien Exp $	*/
+/*	$OpenBSD: if_iwireg.h,v 1.12 2005/03/12 13:31:26 damien Exp $	*/
 
 /*-
  * Copyright (c) 2004, 2005
@@ -129,7 +129,7 @@
 struct iwi_firmware_hdr {
 	u_int32_t	version;
 	u_int32_t	mode;
-} __attribute__((__packed__));
+} __packed;
 
 struct iwi_hdr {
 	u_int8_t	type;
@@ -141,7 +141,7 @@ struct iwi_hdr {
 	u_int8_t	flags;
 #define IWI_HDR_FLAG_IRQ	0x04
 	u_int8_t	reserved;
-} __attribute__((__packed__));
+} __packed;
 
 struct iwi_notif {
 	u_int32_t	reserved[2];
@@ -155,14 +155,14 @@ struct iwi_notif {
 #define IWI_NOTIF_TYPE_NOISE		25
 	u_int8_t	flags;
 	u_int16_t	len;
-} __attribute__((__packed__));
+} __packed;
 
 /* structure for notification IWI_NOTIF_TYPE_AUTHENTICATION */
 struct iwi_notif_authentication {
 	u_int8_t	state;
 #define IWI_DEAUTHENTICATED	0
 #define IWI_AUTHENTICATED	9
-} __attribute__((__packed__));
+} __packed;
 
 /* structure for notification IWI_NOTIF_TYPE_ASSOCIATION */
 struct iwi_notif_association {
@@ -173,13 +173,13 @@ struct iwi_notif_association {
 	u_int16_t		capinfo;
 	u_int16_t		status;
 	u_int16_t		associd;
-} __attribute__((__packed__));
+} __packed;
 
 /* structure for notification IWI_NOTIF_TYPE_SCAN_CHANNEL */
 struct iwi_notif_scan_channel {
 	u_int8_t	nchan;
 	u_int8_t	reserved[47];
-} __attribute__((__packed__));
+} __packed;
 
 /* structure for notification IWI_NOTIF_TYPE_SCAN_COMPLETE */
 struct iwi_notif_scan_complete {
@@ -187,7 +187,7 @@ struct iwi_notif_scan_complete {
 	u_int8_t	nchan;
 	u_int8_t	status;
 	u_int8_t	reserved;
-} __attribute__((__packed__));
+} __packed;
 
 /* received frame header */
 struct iwi_frame {
@@ -204,7 +204,7 @@ struct iwi_frame {
 	u_int8_t	control;
 	u_int8_t	reserved2[2];
 	u_int16_t	len;
-} __attribute__((__packed__));
+} __packed;
 
 /* header for transmission */
 struct iwi_tx_desc {
@@ -233,7 +233,7 @@ struct iwi_tx_desc {
 #define IWI_MAX_NSEG	6
 	u_int32_t	seg_addr[IWI_MAX_NSEG];
 	u_int16_t	seg_len[IWI_MAX_NSEG];
-} __attribute__((__packed__));
+} __packed;
 
 /* command */
 struct iwi_cmd_desc {
@@ -256,7 +256,7 @@ struct iwi_cmd_desc {
 	u_int8_t	len;
 	u_int16_t	reserved;
 	u_int8_t	data[120];
-} __attribute__((__packed__));
+} __packed;
 
 /* constants for 'mode' fields */
 #define IWI_MODE_11A	0
@@ -278,7 +278,7 @@ struct iwi_rateset {
 #define IWI_RATESET_TYPE_SUPPORTED	1
 	u_int8_t	reserved;
 	u_int8_t	rates[12];
-} __attribute__((__packed__));
+} __packed;
 
 /* structure for command IWI_CMD_SET_TX_POWER */
 struct iwi_txpower {
@@ -289,8 +289,8 @@ struct iwi_txpower {
 		u_int8_t	power;
 #define IWI_TXPOWER_MAX		20
 #define IWI_TXPOWER_RATIO	(IEEE80211_TXPOWER_MAX / IWI_TXPOWER_MAX)
-	} __attribute__((__packed__)) chan[37];
-} __attribute__((__packed__));
+	} __packed chan[37];
+} __packed;
 
 /* structure for command IWI_CMD_ASSOCIATE */
 struct iwi_associate {
@@ -312,7 +312,7 @@ struct iwi_associate {
 	u_int8_t	dst[IEEE80211_ADDR_LEN];
 	u_int32_t	reserved3;
 	u_int16_t	reserved4;
-} __attribute__((__packed__));
+} __packed;
 
 /* structure for command IWI_CMD_SCAN */
 struct iwi_scan {
@@ -323,7 +323,7 @@ struct iwi_scan {
 #define IWI_CHAN_5GHZ	(0 << 6)
 #define IWI_CHAN_2GHZ	(1 << 6)
 	u_int8_t	reserved[3];
-} __attribute__((__packed__));
+} __packed;
 
 /* structure for command IWI_CMD_SET_CONFIGURATION */
 struct iwi_configuration {
@@ -347,7 +347,7 @@ struct iwi_configuration {
 	u_int8_t	allow_mgt;
 	u_int8_t	noise_reported;
 	u_int8_t	reserved5;
-} __attribute__((__packed__));
+} __packed;
 
 /* structure for command IWI_CMD_SET_WEP_KEY */
 struct iwi_wep_key {
@@ -357,7 +357,7 @@ struct iwi_wep_key {
 	u_int8_t	idx;
 	u_int8_t	len;
 	u_int8_t	key[IEEE80211_KEYBUF_SIZE];
-} __attribute__((__packed__));
+} __packed;
 
 /* EEPROM = Electrically Erasable Programmable Read-Only Memory */
 
diff --git a/sys/dev/pci/if_iwivar.h b/sys/dev/pci/if_iwivar.h
index e8f79daa3e5..fe28b1a4611 100644
--- a/sys/dev/pci/if_iwivar.h
+++ b/sys/dev/pci/if_iwivar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_iwivar.h,v 1.8 2005/03/01 19:30:38 damien Exp $	*/
+/*	$OpenBSD: if_iwivar.h,v 1.9 2005/03/12 13:31:26 damien Exp $	*/
 
 /*-
  * Copyright (c) 2004, 2005
@@ -36,7 +36,7 @@ struct iwi_rx_radiotap_header {
 	u_int8_t	wr_antsignal;
 	u_int8_t	wr_antnoise;
 	u_int8_t	wr_antenna;
-} __attribute__((__packed__));
+} __packed;
 
 #define IWI_RX_RADIOTAP_PRESENT						\
 	((1 << IEEE80211_RADIOTAP_FLAGS) |				\
@@ -51,7 +51,7 @@ struct iwi_tx_radiotap_header {
 	u_int8_t	wt_flags;
 	u_int16_t	wt_chan_freq;
 	u_int16_t	wt_chan_flags;
-} __attribute__((__packed__));
+} __packed;
 
 #define IWI_TX_RADIOTAP_PRESENT						\
 	((1 << IEEE80211_RADIOTAP_FLAGS) |				\