Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 66774
b: refs/heads/master
c: fb9bc28
h: refs/heads/master
v: v3
  • Loading branch information
Michael Wu authored and David S. Miller committed Oct 10, 2007
1 parent b24bb51 commit ac2852a
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 2e08ac7e27c1e54ebf0f82abc03285663efe7d89
refs/heads/master: fb9bc28f8bd8a6b9bc5fba7bcacc4bb131d2d5dc
7 changes: 3 additions & 4 deletions trunk/drivers/net/wireless/adm8211.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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);

Expand Down

0 comments on commit ac2852a

Please sign in to comment.