Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2e20cc39 authored by Larry Finger's avatar Larry Finger Committed by John W. Linville
Browse files

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: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 78236571

drivers/net/wireless/p54/p54common.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -183,7 +183,7 @@ int p54_parse_firmware(struct ieee80211_hw *dev, const struct firmware *fw) 
			priv->headroom = desc->headroom;

			priv->headroom = desc->headroom;

			priv->tailroom = desc->tailroom;

			priv->tailroom = desc->tailroom;

			if (le32_to_cpu(bootrec->len) == 11)

			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

			else

				priv->rx_mtu = (size_t)

				priv->rx_mtu = (size_t)

					0x620 - priv->tx_hdr_len;

					0x620 - priv->tx_hdr_len;

drivers/net/wireless/p54/p54common.h

+2 −1
Original line number Original line Diff line number Diff line
@@ -19,7 +19,6 @@ struct bootrec { 
	__le32 code;

	__le32 code;

	__le32 len;

	__le32 len;

	u32 data[10];

	u32 data[10];

	__le16 rx_mtu;

} __attribute__((packed));

} __attribute__((packed));





struct bootrec_exp_if {

struct bootrec_exp_if {
@@ -39,6 +38,8 @@ struct bootrec_desc { 
	u8 tailroom;

	u8 tailroom;

	u8 unimportant[6];

	u8 unimportant[6];

	u8 rates[16];

	u8 rates[16];

	u8 padding2[4];

	__le16 rx_mtu;

} __attribute__((packed));

} __attribute__((packed));





#define BR_CODE_MIN			0x80000000

#define BR_CODE_MIN			0x80000000