---

yaml --- r: 86913 b: refs/heads/master c: 8c28293 h: refs/heads/master i: 86911: 219931f v: v3
git-mirror · Mar 4, 2008 · a8c100d · a8c100d
1 parent 79348b5
commit a8c100d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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));