summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorDamien Bergamini <damien@cvs.openbsd.org>2005-03-01 19:30:43 +0000
committerDamien Bergamini <damien@cvs.openbsd.org>2005-03-01 19:30:43 +0000
commitd6d2cfd1949bcdd11d2835821c14ff82eea463fa (patch)
tree06818175230c73b3cb9df45d6ff17cd8dd8533b5 /sys
parentb21c43ee2891c533e7fc0b352c2adb16c12f2dec (diff)
make sure radiotap structures are packed.
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/ic/ralvar.h6
-rw-r--r--sys/dev/pci/if_ipwvar.h6
-rw-r--r--sys/dev/pci/if_iwivar.h6
3 files changed, 9 insertions, 9 deletions
diff --git a/sys/dev/ic/ralvar.h b/sys/dev/ic/ralvar.h
index 9101e402d8a..5b612c5326a 100644
--- a/sys/dev/ic/ralvar.h
+++ b/sys/dev/ic/ralvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ralvar.h,v 1.4 2005/02/28 17:49:22 damien Exp $ */
+/* $OpenBSD: ralvar.h,v 1.5 2005/03/01 19:30:42 damien Exp $ */
/*-
* Copyright (c) 2005
@@ -26,7 +26,7 @@ struct ral_rx_radiotap_header {
uint16_t wr_chan_flags;
uint8_t wr_antenna;
uint8_t wr_antsignal;
-};
+} __packed;
#define RAL_RX_RADIOTAP_PRESENT \
((1 << IEEE80211_RADIOTAP_TSFT) | \
@@ -42,7 +42,7 @@ struct ral_tx_radiotap_header {
uint16_t wt_chan_freq;
uint16_t wt_chan_flags;
uint8_t wt_antenna;
-};
+} __packed;
#define RAL_TX_RADIOTAP_PRESENT \
((1 << IEEE80211_RADIOTAP_FLAGS) | \
diff --git a/sys/dev/pci/if_ipwvar.h b/sys/dev/pci/if_ipwvar.h
index 6e565cfd46f..06f47c52066 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.9 2005/02/21 13:33:29 damien Exp $ */
+/* $OpenBSD: if_ipwvar.h,v 1.10 2005/03/01 19:30:38 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__));
#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__));
#define IPW_TX_RADIOTAP_PRESENT \
((1 << IEEE80211_RADIOTAP_FLAGS) | \
diff --git a/sys/dev/pci/if_iwivar.h b/sys/dev/pci/if_iwivar.h
index e4c35848f3a..e8f79daa3e5 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.7 2005/02/21 13:33:29 damien Exp $ */
+/* $OpenBSD: if_iwivar.h,v 1.8 2005/03/01 19:30:38 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__));
#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__));
#define IWI_TX_RADIOTAP_PRESENT \
((1 << IEEE80211_RADIOTAP_FLAGS) | \