From a8c100dfc137940269d4cef8c812d82ddc83e8d8 Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes@sipsolutions.net>
Date: Fri, 29 Feb 2008 13:56:33 +0100
Subject: [PATCH] --- yaml --- r: 86913 b: refs/heads/master c:
 8c28293f5514f64ba064bac7946aebeda4a663c6 h: refs/heads/master i:   86911:
 219931f9fbb679f3c65a176da20aed285727ad3f v: v3

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

diff --git a/[refs] b/[refs]
index 401700acc56c..e64d1680fecf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dc63644b0ee3b447e879ef8e124657b40e9ea81c
+refs/heads/master: 8c28293f5514f64ba064bac7946aebeda4a663c6
diff --git a/trunk/drivers/net/wireless/p54common.c b/trunk/drivers/net/wireless/p54common.c
index 5cda49aff3a8..56aabec73c20 100644
--- a/trunk/drivers/net/wireless/p54common.c
+++ b/trunk/drivers/net/wireless/p54common.c
@@ -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) {
diff --git a/trunk/drivers/net/wireless/p54common.h b/trunk/drivers/net/wireless/p54common.h
index a721334e20d9..b67ff34e26fe 100644
--- a/trunk/drivers/net/wireless/p54common.h
+++ b/trunk/drivers/net/wireless/p54common.h
@@ -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));