summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorMichael Wu <flamingice@sourmilk.net>2007-09-24 18:10:25 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-10-10 16:53:08 -0700
commitfb9bc28f8bd8a6b9bc5fba7bcacc4bb131d2d5dc (patch)
tree3ba55a34149b7c6888be22f80adb7938ab2fe8ea /drivers
parent2e08ac7e27c1e54ebf0f82abc03285663efe7d89 (diff)
downloadop-kernel-dev-fb9bc28f8bd8a6b9bc5fba7bcacc4bb131d2d5dc.zip
op-kernel-dev-fb9bc28f8bd8a6b9bc5fba7bcacc4bb131d2d5dc.tar.gz
[PATCH] adm8211: Improve writing of mac addrs to registers
The mac address write is broken for big endian and the bssid write can be simplified. This patch does both. Signed-off-by: Michael Wu <flamingice@sourmilk.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/wireless/adm8211.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/wireless/adm8211.c b/drivers/net/wireless/adm8211.c
index 0893d0d..4c43cdb 100644
--- a/drivers/net/wireless/adm8211.c
+++ b/drivers/net/wireless/adm8211.c
@@ -1283,8 +1283,7 @@ static void adm8211_set_bssid(struct ieee80211_hw *dev, const u8 *bssid)
struct adm8211_priv *priv = dev->priv;
u32 reg;
- reg = bssid[0] | (bssid[1] << 8) | (bssid[2] << 16) | (bssid[3] << 24);
- ADM8211_CSR_WRITE(BSSID0, reg);
+ ADM8211_CSR_WRITE(BSSID0, le32_to_cpu(*(__le32 *)bssid));
reg = ADM8211_CSR_READ(ABDA1);
reg &= 0x0000ffff;
reg |= (bssid[4] << 16) | (bssid[5] << 24);
@@ -1414,8 +1413,8 @@ static int adm8211_add_interface(struct ieee80211_hw *dev,
ADM8211_IDLE();
- ADM8211_CSR_WRITE(PAR0, *(u32 *)conf->mac_addr);
- ADM8211_CSR_WRITE(PAR1, *(u16 *)(conf->mac_addr + 4));
+ ADM8211_CSR_WRITE(PAR0, le32_to_cpu(*(__le32 *)conf->mac_addr));
+ ADM8211_CSR_WRITE(PAR1, le16_to_cpu(*(__le16 *)(conf->mac_addr + 4)));
adm8211_update_mode(dev);
OpenPOWER on IntegriCloud