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

Commit 8c28293f authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

p54: fix EEPROM structure endianness 



Since the EEPROM structure is read from hardware, it is
always little endian, annotate that in the struct and
make sure to convert where applicable.

Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Cc: Michael Wu <flamingice@sourmilk.net>
Tested-by: default avatarFlorian Fainelli <florian.fainelli@telecomint.eu>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent dc63644b

drivers/net/wireless/p54common.c

+1 −1
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ int p54_parse_eeprom(struct ieee80211_hw *dev, void *eeprom, int len) 
	int err;



	wrap = (struct eeprom_pda_wrap *) eeprom;

	entry = (void *)wrap->data + wrap->len;

	entry = (void *)wrap->data + le16_to_cpu(wrap->len);

	i += 2;

	i += le16_to_cpu(entry->len)*2;

	while (i < len) {

drivers/net/wireless/p54common.h

+4 −4
Original line number Diff line number Diff line
@@ -53,10 +53,10 @@ struct pda_entry { 
} __attribute__ ((packed));



struct eeprom_pda_wrap {

	u32 magic;

	u16 pad;

	u16 len;

	u32 arm_opcode;

	__le32 magic;

	__le16 pad;

	__le16 len;

	__le32 arm_opcode;

	u8 data[0];

} __attribute__ ((packed));