p54: Move rx_mtu to struct bootrec_desc

PATCH New Larry Finger 1 participant 1 message Oct 10, 2008 Networking drivers (wireless)

Share & tools

Larry Finger

author

2008-10-10 00:38 UTC #0 lore raw

PATCH 1/1 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 <[email protected]>

---

John,

I'm neutral regarding this change, which was suggested by Christian. I'll leave it up to you whether it gets applied. It is 2.6.28 material.

Larry
---

drivers/net/wireless/p54/p54common.c +1 -1

Index: wireless-testing/drivers/net/wireless/p54/p54common.c
===================================================================
@@ -183,7 +183,7 @@ int p54_parse_firmware(struct ieee80211_
 			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;

drivers/net/wireless/p54/p54common.h +2 -1

Index: wireless-testing/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