From 8407b4cf49c3b043eccbb9f089b65cfaa54082ea Mon Sep 17 00:00:00 2001 From: Al Viro Date: Fri, 21 Dec 2007 23:49:02 -0500 Subject: [PATCH] --- yaml --- r: 79340 b: refs/heads/master c: dc73c623dd0a653bf80ec41870dcf8b601fc6e9b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/p54common.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index fcb82d09fea5..9b4272f9e0da 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e0c0056c677709bd1e2c18b84a1d10e54f7c8fcc +refs/heads/master: dc73c623dd0a653bf80ec41870dcf8b601fc6e9b diff --git a/trunk/drivers/net/wireless/p54common.c b/trunk/drivers/net/wireless/p54common.c index ad5c307a4410..9660fdd873ac 100644 --- a/trunk/drivers/net/wireless/p54common.c +++ b/trunk/drivers/net/wireless/p54common.c @@ -54,7 +54,7 @@ void p54_parse_firmware(struct ieee80211_hw *dev, const struct firmware *fw) u32 code = le32_to_cpu(bootrec->code); switch (code) { case BR_CODE_COMPONENT_ID: - switch (be32_to_cpu(*bootrec->data)) { + switch (be32_to_cpu(*(__be32 *)bootrec->data)) { case FW_FMAC: printk(KERN_INFO "p54: FreeMAC firmware\n"); break; @@ -78,14 +78,14 @@ void p54_parse_firmware(struct ieee80211_hw *dev, const struct firmware *fw) fw_version = (unsigned char*)bootrec->data; break; case BR_CODE_DESCR: - priv->rx_start = le32_to_cpu(bootrec->data[1]); + priv->rx_start = le32_to_cpu(((__le32 *)bootrec->data)[1]); /* FIXME add sanity checking */ - priv->rx_end = le32_to_cpu(bootrec->data[2]) - 0x3500; + priv->rx_end = le32_to_cpu(((__le32 *)bootrec->data)[2]) - 0x3500; break; case BR_CODE_EXPOSED_IF: exp_if = (struct bootrec_exp_if *) bootrec->data; for (i = 0; i < (len * sizeof(*exp_if) / 4); i++) - if (exp_if[i].if_id == 0x1a) + if (exp_if[i].if_id == cpu_to_le16(0x1a)) priv->fw_var = le16_to_cpu(exp_if[i].variant); break; case BR_CODE_DEPENDENT_IF: