From 7694cd936851406e198587c2139b33501eb81fd2 Mon Sep 17 00:00:00 2001
From: Bill Paul <wpaul@FreeBSD.org>
Date: Tue, 20 Jul 1999 20:03:42 +0000
Subject: [PATCH] Correct the alignment of some of the members in the wi_frame
 structure. The structure is the right length, but some of the members
 (notably wi_q_info) were off a bit. This causes the received signal strength
 values to appear bogus.

---
 sys/dev/wi/if_wireg.h   | 8 +++++---
 sys/i386/isa/if_wireg.h | 8 +++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/sys/dev/wi/if_wireg.h b/sys/dev/wi/if_wireg.h
index 8c9c6e6797c..75c963ea468 100644
--- a/sys/dev/wi/if_wireg.h
+++ b/sys/dev/wi/if_wireg.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_wireg.h,v 1.31 1999/05/07 03:14:21 wpaul Exp $
+ *	$Id: if_wireg.h,v 1.4 1999/05/07 03:28:52 wpaul Exp $
  */
 
 struct wi_counters {
@@ -543,9 +543,11 @@ struct wi_ltv_mcast {
  */
 struct wi_frame {
 	u_int16_t		wi_status;	/* 0x00 */
-	u_int32_t		wi_rsvd0;	/* 0x02 */
+	u_int16_t		wi_rsvd0;	/* 0x02 */
+	u_int16_t		wi_rsvd1;	/* 0x04 */
 	u_int16_t		wi_q_info;	/* 0x06 */
-	u_int16_t		wi_rsvd1;	/* 0x08 */
+	u_int16_t		wi_rsvd2;	/* 0x08 */
+	u_int16_t		wi_rsvd3;	/* 0x0A */
 	u_int16_t		wi_tx_ctl;	/* 0x0C */
 	u_int16_t		wi_frame_ctl;	/* 0x0E */
 	u_int16_t		wi_id;		/* 0x10 */
diff --git a/sys/i386/isa/if_wireg.h b/sys/i386/isa/if_wireg.h
index 8c9c6e6797c..75c963ea468 100644
--- a/sys/i386/isa/if_wireg.h
+++ b/sys/i386/isa/if_wireg.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_wireg.h,v 1.31 1999/05/07 03:14:21 wpaul Exp $
+ *	$Id: if_wireg.h,v 1.4 1999/05/07 03:28:52 wpaul Exp $
  */
 
 struct wi_counters {
@@ -543,9 +543,11 @@ struct wi_ltv_mcast {
  */
 struct wi_frame {
 	u_int16_t		wi_status;	/* 0x00 */
-	u_int32_t		wi_rsvd0;	/* 0x02 */
+	u_int16_t		wi_rsvd0;	/* 0x02 */
+	u_int16_t		wi_rsvd1;	/* 0x04 */
 	u_int16_t		wi_q_info;	/* 0x06 */
-	u_int16_t		wi_rsvd1;	/* 0x08 */
+	u_int16_t		wi_rsvd2;	/* 0x08 */
+	u_int16_t		wi_rsvd3;	/* 0x0A */
 	u_int16_t		wi_tx_ctl;	/* 0x0C */
 	u_int16_t		wi_frame_ctl;	/* 0x0E */
 	u_int16_t		wi_id;		/* 0x10 */