From a9b352908bbbfb33da84c68e6d9653949630fcba Mon Sep 17 00:00:00 2001
From: Larry Finger <Larry.Finger@lwfinger.net>
Date: Thu, 9 Oct 2008 17:38:52 -0700
Subject: [PATCH] --- yaml --- r: 121578 b: refs/heads/master c:
 2e20cc3986cbee410fbe8e3e116bdcb12d70fcce h: refs/heads/master v: v3

---
 [refs]                                     | 2 +-
 trunk/drivers/net/wireless/p54/p54common.c | 2 +-
 trunk/drivers/net/wireless/p54/p54common.h | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index e09fcf07ddb3..00bf34d97296 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 78236571a538860dc2f0842ff6c7789522eb1e63
+refs/heads/master: 2e20cc3986cbee410fbe8e3e116bdcb12d70fcce
diff --git a/trunk/drivers/net/wireless/p54/p54common.c b/trunk/drivers/net/wireless/p54/p54common.c
index b3c297ed00cd..f8cdd88e010e 100644
--- a/trunk/drivers/net/wireless/p54/p54common.c
+++ b/trunk/drivers/net/wireless/p54/p54common.c
@@ -183,7 +183,7 @@ int p54_parse_firmware(struct ieee80211_hw *dev, const struct firmware *fw)
 			priv->headroom = desc->headroom;
 			priv->tailroom = desc->tailroom;
 			if (le32_to_cpu(bootrec->len) == 11)
-				priv->rx_mtu = le16_to_cpu(bootrec->rx_mtu);
+				priv->rx_mtu = le16_to_cpu(desc->rx_mtu);
 			else
 				priv->rx_mtu = (size_t)
 					0x620 - priv->tx_hdr_len;
diff --git a/trunk/drivers/net/wireless/p54/p54common.h b/trunk/drivers/net/wireless/p54/p54common.h
index 2fa994cfcfed..22af41c7dab6 100644
--- a/trunk/drivers/net/wireless/p54/p54common.h
+++ b/trunk/drivers/net/wireless/p54/p54common.h
@@ -19,7 +19,6 @@ struct bootrec {
 	__le32 code;
 	__le32 len;
 	u32 data[10];
-	__le16 rx_mtu;
 } __attribute__((packed));
 
 struct bootrec_exp_if {
@@ -39,6 +38,8 @@ struct bootrec_desc {
 	u8 tailroom;
 	u8 unimportant[6];
 	u8 rates[16];
+	u8 padding2[4];
+	__le16 rx_mtu;
 } __attribute__((packed));
 
 #define BR_CODE_MIN			0x80000000