diff options
| author | Reyk Floeter <reyk@cvs.openbsd.org> | 2004-12-30 23:32:56 +0000 |
|---|---|---|
| committer | Reyk Floeter <reyk@cvs.openbsd.org> | 2004-12-30 23:32:56 +0000 |
| commit | d9f2d8ebcd5d16f35a936a1c258d085f0b888825 (patch) | |
| tree | 3cdc0c38807fb420e55c1bc723b767c060e0b9e1 /sys/net80211 | |
| parent | 949f4073b0f44ffe039059bd40f5aa22931f35f6 (diff) | |
replace __attribute__((__packed__)) with __packed.
Diffstat (limited to 'sys/net80211')
| -rw-r--r-- | sys/net80211/ieee80211.h | 30 | ||||
| -rw-r--r-- | sys/net80211/ieee80211_radiotap.h | 4 |
2 files changed, 17 insertions, 17 deletions
diff --git a/sys/net80211/ieee80211.h b/sys/net80211/ieee80211.h index 392bef33019..a6a4c116981 100644 --- a/sys/net80211/ieee80211.h +++ b/sys/net80211/ieee80211.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ieee80211.h,v 1.6 2004/12/28 23:07:32 jsg Exp $ */ +/* $OpenBSD: ieee80211.h,v 1.7 2004/12/30 23:32:55 reyk Exp $ */ /* $NetBSD: ieee80211.h,v 1.6 2004/04/30 23:51:53 dyoung Exp $ */ /*- @@ -52,7 +52,7 @@ struct ieee80211_plcp_hdr { u_int8_t i_service; u_int16_t i_length; u_int16_t i_crc; -} __attribute__((__packed__)); +} __packed; #define IEEE80211_PLCP_SFD 0xF3A0 #define IEEE80211_PLCP_SERVICE 0x00 @@ -71,7 +71,7 @@ struct ieee80211_frame { u_int8_t i_seq[2]; /* possibly followed by addr4[IEEE80211_ADDR_LEN]; */ /* see below */ -} __attribute__((__packed__)); +} __packed; struct ieee80211_qosframe { u_int8_t i_fc[2]; @@ -83,7 +83,7 @@ struct ieee80211_qosframe { u_int8_t i_qos[2]; /* possibly followed by addr4[IEEE80211_ADDR_LEN]; */ /* see below */ -} __attribute__((__packed__)); +} __packed; struct ieee80211_qoscntl { u_int8_t i_qos[2]; @@ -97,7 +97,7 @@ struct ieee80211_frame_addr4 { u_int8_t i_addr3[IEEE80211_ADDR_LEN]; u_int8_t i_seq[2]; u_int8_t i_addr4[IEEE80211_ADDR_LEN]; -} __attribute__((__packed__)); +} __packed; struct ieee80211_qosframe_addr4 { @@ -109,7 +109,7 @@ struct ieee80211_qosframe_addr4 { u_int8_t i_seq[2]; u_int8_t i_addr4[IEEE80211_ADDR_LEN]; u_int8_t i_qos[2]; -} __attribute__((__packed__)); +} __packed; /* * Management Notification Frame @@ -119,7 +119,7 @@ struct ieee80211_mnf { u_int8_t mnf_action; u_int8_t mnf_dialog; u_int8_t mnf_status; -} __attribute__((__packed__)); +} __packed; #define MNF_SETUP_REQ 0 #define MNF_SETUP_RESP 1 #define MNF_TEARDOWN 2 @@ -150,7 +150,7 @@ struct ieee80211_wme_tspec { u_int8_t ts_delay[4]; u_int8_t ts_surplus[2]; u_int8_t ts_medium_time[2]; -} __attribute__((__packed__)); +} __packed; #define IEEE80211_FC0_VERSION_MASK 0x03 #define IEEE80211_FC0_VERSION_SHIFT 0 @@ -228,7 +228,7 @@ struct ieee80211_frame_min { u_int8_t i_addr1[IEEE80211_ADDR_LEN]; u_int8_t i_addr2[IEEE80211_ADDR_LEN]; /* FCS */ -} __attribute__((__packed__)); +} __packed; struct ieee80211_frame_rts { u_int8_t i_fc[2]; @@ -236,21 +236,21 @@ struct ieee80211_frame_rts { u_int8_t i_ra[IEEE80211_ADDR_LEN]; u_int8_t i_ta[IEEE80211_ADDR_LEN]; /* FCS */ -} __attribute__((__packed__)); +} __packed; struct ieee80211_frame_cts { u_int8_t i_fc[2]; u_int8_t i_dur[2]; u_int8_t i_ra[IEEE80211_ADDR_LEN]; /* FCS */ -} __attribute__((__packed__)); +} __packed; struct ieee80211_frame_ack { u_int8_t i_fc[2]; u_int8_t i_dur[2]; u_int8_t i_ra[IEEE80211_ADDR_LEN]; /* FCS */ -} __attribute__((__packed__)); +} __packed; struct ieee80211_frame_pspoll { u_int8_t i_fc[2]; @@ -258,7 +258,7 @@ struct ieee80211_frame_pspoll { u_int8_t i_bssid[IEEE80211_ADDR_LEN]; u_int8_t i_ta[IEEE80211_ADDR_LEN]; /* FCS */ -} __attribute__((__packed__)); +} __packed; struct ieee80211_frame_cfend { /* NB: also CF-End+CF-Ack */ u_int8_t i_fc[2]; @@ -266,7 +266,7 @@ struct ieee80211_frame_cfend { /* NB: also CF-End+CF-Ack */ u_int8_t i_ra[IEEE80211_ADDR_LEN]; u_int8_t i_bssid[IEEE80211_ADDR_LEN]; /* FCS */ -} __attribute__((__packed__)); +} __packed; /* * BEACON management packets @@ -317,7 +317,7 @@ struct ieee80211_ie_wpa { u_int32_t wpa_uciphers[8];/* ciphers */ u_int16_t wpa_authselcnt; /* authentication selector cnt*/ u_int32_t wpa_authsels[8];/* selectors */ -} __attribute__((__packed__)); +} __packed; /* * Management information elements diff --git a/sys/net80211/ieee80211_radiotap.h b/sys/net80211/ieee80211_radiotap.h index 64b8317db41..d0559e3fc01 100644 --- a/sys/net80211/ieee80211_radiotap.h +++ b/sys/net80211/ieee80211_radiotap.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ieee80211_radiotap.h,v 1.3 2004/12/25 20:40:19 deraadt Exp $ */ +/* $OpenBSD: ieee80211_radiotap.h,v 1.4 2004/12/30 23:32:55 reyk Exp $ */ /* $FreeBSD: src/sys/net80211/ieee80211_radiotap.h,v 1.3 2004/04/05 22:13:21 sam Exp $ */ /* $NetBSD: ieee80211_radiotap.h,v 1.9 2004/06/06 04:13:28 dyoung Exp $ */ @@ -78,7 +78,7 @@ struct ieee80211_radiotap_header { * Additional extensions are made * by setting bit 31. */ -} __attribute__((__packed__)); +} __packed; /* Name Data type Units * ---- --------- ----- |