p54: Move rx_mtu to struct bootrec_desc

The patch entitled "[PATCH] p54: Fix sparse warnings" added the __le16
variable rx_mtu to struct bootrec, but it could equally well be placed
in the struct bootrec_desc, which overlays the 'data' section of bootrec.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

2 files changed, 3 insertions, 2 deletions

diff --git a/drivers/net/wireless/p54/p54common.c b/drivers/net/wireless/p54/p54common.c
index b3c297ed00cd..f8cdd88e010e 100644
--- a/drivers/net/wireless/p54/p54common.c
+++ b/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/drivers/net/wireless/p54/p54common.h b/drivers/net/wireless/p54/p54common.h
index 2fa994cfcfed..22af41c7dab6 100644
--- a/drivers/net/wireless/p54/p54common.h
+++ b/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