summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2002-06-21 06:48:19 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2002-06-21 06:48:19 +0000
commit2aa043eadcf9ddd0f06b6d5d5943e6b5a54e6c94 (patch)
tree9eb9d6fcb0349394dbd0eabe89db0638562aefb6 /sys
parent8d0c96116176e6f2bb6cedf74036f43ce2589dea (diff)
put the objects in a better order, so that they align correctly.
whoever made struct ieee80211_nwid an odd-sized structure and created this particular little corner of alignment hell surely deserves a boot to the head.
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/ic/if_wivar.h10
1 files changed, 6 insertions, 4 deletions
diff --git a/sys/dev/ic/if_wivar.h b/sys/dev/ic/if_wivar.h
index 60e89db2527..ab6de5e97f3 100644
--- a/sys/dev/ic/if_wivar.h
+++ b/sys/dev/ic/if_wivar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_wivar.h,v 1.14 2002/06/15 18:49:04 millert Exp $ */
+/* $OpenBSD: if_wivar.h,v 1.15 2002/06/21 06:48:18 deraadt Exp $ */
/*
* Copyright (c) 1997, 1998, 1999
@@ -68,13 +68,15 @@ struct wi_softc {
u_int16_t wi_supprates;
u_int16_t wi_diversity;
+ u_int8_t wi_txbuf[1596];
+ u_int8_t wi_scanbuf[1596];
+
+ u_int8_t wi_scanbuf_len;
+
struct ieee80211_nwid wi_node_name;
struct ieee80211_nwid wi_net_name;
struct ieee80211_nwid wi_ibss_name;
- u_int8_t wi_txbuf[1596];
- u_int8_t wi_scanbuf[1596];
- u_int8_t wi_scanbuf_len;
int wi_use_wep;
int wi_tx_key;
struct wi_ltv_keys wi_keys;