diff options
| author | Reyk Floeter <reyk@cvs.openbsd.org> | 2005-05-27 11:42:53 +0000 |
|---|---|---|
| committer | Reyk Floeter <reyk@cvs.openbsd.org> | 2005-05-27 11:42:53 +0000 |
| commit | d2f43a6225c83717ba75d75bf10ab8cdb45bb41e (patch) | |
| tree | 2d6644204345b4edf9a1c62abbcd9d49322e661b | |
| parent | 6f21e7a71a49d31b46a6e810bdeef37beba183fa (diff) | |
remove some misplaced htole32s
| -rw-r--r-- | sys/dev/ic/ar5210.c | 14 | ||||
| -rw-r--r-- | sys/dev/ic/ar5211.c | 14 | ||||
| -rw-r--r-- | sys/dev/ic/ar5212.c | 14 |
3 files changed, 21 insertions, 21 deletions
diff --git a/sys/dev/ic/ar5210.c b/sys/dev/ic/ar5210.c index 8466dffd121..73ad8c7ddc4 100644 --- a/sys/dev/ic/ar5210.c +++ b/sys/dev/ic/ar5210.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ar5210.c,v 1.24 2005/05/24 21:46:17 reyk Exp $ */ +/* $OpenBSD: ar5210.c,v 1.25 2005/05/27 11:42:51 reyk Exp $ */ /* * Copyright (c) 2004, 2005 Reyk Floeter <reyk@vantronix.net> @@ -1545,9 +1545,9 @@ ar5k_ar5210_set_lladdr(hal, mac) bcopy(mac, &low_id, 4); bcopy(mac + 4, &high_id, 2); - high_id = 0x0000ffff & htole32(high_id); + high_id = 0x0000ffff & high_id; - AR5K_REG_WRITE(AR5K_AR5210_STA_ID0, htole32(low_id)); + AR5K_REG_WRITE(AR5K_AR5210_STA_ID0, low_id); AR5K_REG_WRITE(AR5K_AR5210_STA_ID1, high_id); return (AH_TRUE); @@ -1622,8 +1622,8 @@ ar5k_ar5210_set_associd(hal, bssid, assoc_id, tim_offset) */ bcopy(bssid, &low_id, 4); bcopy(bssid + 4, &high_id, 2); - AR5K_REG_WRITE(AR5K_AR5210_BSS_ID0, htole32(low_id)); - AR5K_REG_WRITE(AR5K_AR5210_BSS_ID1, htole32(high_id) | + AR5K_REG_WRITE(AR5K_AR5210_BSS_ID0, low_id); + AR5K_REG_WRITE(AR5K_AR5210_BSS_ID1, high_id | ((assoc_id & 0x3fff) << AR5K_AR5210_BSS_ID1_AID_S)); bcopy(bssid, &hal->ah_bssid, IEEE80211_ADDR_LEN); @@ -1995,8 +1995,8 @@ ar5k_ar5210_set_key_lladdr(hal, entry, mac) bcopy(mac_v + 4, &high_id, 2); high_id |= AR5K_AR5210_KEYTABLE_VALID; - AR5K_REG_WRITE(AR5K_AR5210_KEYTABLE_MAC0(entry), htole32(low_id)); - AR5K_REG_WRITE(AR5K_AR5210_KEYTABLE_MAC1(entry), htole32(high_id)); + AR5K_REG_WRITE(AR5K_AR5210_KEYTABLE_MAC0(entry), low_id); + AR5K_REG_WRITE(AR5K_AR5210_KEYTABLE_MAC1(entry), high_id); return (AH_TRUE); } diff --git a/sys/dev/ic/ar5211.c b/sys/dev/ic/ar5211.c index 0e91773a987..18e098dcd00 100644 --- a/sys/dev/ic/ar5211.c +++ b/sys/dev/ic/ar5211.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ar5211.c,v 1.15 2005/05/24 21:46:18 reyk Exp $ */ +/* $OpenBSD: ar5211.c,v 1.16 2005/05/27 11:42:52 reyk Exp $ */ /* * Copyright (c) 2004, 2005 Reyk Floeter <reyk@vantronix.net> @@ -1626,9 +1626,9 @@ ar5k_ar5211_set_lladdr(hal, mac) bcopy(mac, &low_id, 4); bcopy(mac + 4, &high_id, 2); - high_id = 0x0000ffff & htole32(high_id); + high_id = 0x0000ffff & high_id; - AR5K_REG_WRITE(AR5K_AR5211_STA_ID0, htole32(low_id)); + AR5K_REG_WRITE(AR5K_AR5211_STA_ID0, low_id); AR5K_REG_WRITE(AR5K_AR5211_STA_ID1, high_id); return (AH_TRUE); @@ -1710,8 +1710,8 @@ ar5k_ar5211_set_associd(hal, bssid, assoc_id, tim_offset) */ bcopy(bssid, &low_id, 4); bcopy(bssid + 4, &high_id, 2); - AR5K_REG_WRITE(AR5K_AR5211_BSS_ID0, htole32(low_id)); - AR5K_REG_WRITE(AR5K_AR5211_BSS_ID1, htole32(high_id) | + AR5K_REG_WRITE(AR5K_AR5211_BSS_ID0, low_id); + AR5K_REG_WRITE(AR5K_AR5211_BSS_ID1, high_id | ((assoc_id & 0x3fff) << AR5K_AR5211_BSS_ID1_AID_S)); bcopy(bssid, hal->ah_bssid, IEEE80211_ADDR_LEN); @@ -2087,8 +2087,8 @@ ar5k_ar5211_set_key_lladdr(hal, entry, mac) bcopy(mac_v + 4, &high_id, 2); high_id |= AR5K_AR5211_KEYTABLE_VALID; - AR5K_REG_WRITE(AR5K_AR5211_KEYTABLE_MAC0(entry), htole32(low_id)); - AR5K_REG_WRITE(AR5K_AR5211_KEYTABLE_MAC1(entry), htole32(high_id)); + AR5K_REG_WRITE(AR5K_AR5211_KEYTABLE_MAC0(entry), low_id); + AR5K_REG_WRITE(AR5K_AR5211_KEYTABLE_MAC1(entry), high_id); return (AH_TRUE); } diff --git a/sys/dev/ic/ar5212.c b/sys/dev/ic/ar5212.c index 973a6ca3505..dcf781b110e 100644 --- a/sys/dev/ic/ar5212.c +++ b/sys/dev/ic/ar5212.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ar5212.c,v 1.19 2005/05/24 21:46:18 reyk Exp $ */ +/* $OpenBSD: ar5212.c,v 1.20 2005/05/27 11:42:52 reyk Exp $ */ /* * Copyright (c) 2004, 2005 Reyk Floeter <reyk@vantronix.net> @@ -1890,9 +1890,9 @@ ar5k_ar5212_set_lladdr(hal, mac) bcopy(mac, &low_id, 4); bcopy(mac + 4, &high_id, 2); - high_id = 0x0000ffff & htole32(high_id); + high_id = 0x0000ffff & high_id; - AR5K_REG_WRITE(AR5K_AR5212_STA_ID0, htole32(low_id)); + AR5K_REG_WRITE(AR5K_AR5212_STA_ID0, low_id); AR5K_REG_WRITE(AR5K_AR5212_STA_ID1, high_id); return (AH_TRUE); @@ -1980,8 +1980,8 @@ ar5k_ar5212_set_associd(hal, bssid, assoc_id, tim_offset) */ bcopy(bssid, &low_id, 4); bcopy(bssid + 4, &high_id, 2); - AR5K_REG_WRITE(AR5K_AR5212_BSS_ID0, htole32(low_id)); - AR5K_REG_WRITE(AR5K_AR5212_BSS_ID1, htole32(high_id) | + AR5K_REG_WRITE(AR5K_AR5212_BSS_ID0, low_id); + AR5K_REG_WRITE(AR5K_AR5212_BSS_ID1, high_id | ((assoc_id & 0x3fff) << AR5K_AR5212_BSS_ID1_AID_S)); bcopy(bssid, &hal->ah_bssid, IEEE80211_ADDR_LEN); @@ -2394,8 +2394,8 @@ ar5k_ar5212_set_key_lladdr(hal, entry, mac) bcopy(mac_v + 4, &high_id, 2); high_id |= AR5K_AR5212_KEYTABLE_VALID; - AR5K_REG_WRITE(AR5K_AR5212_KEYTABLE_MAC0(entry), htole32(low_id)); - AR5K_REG_WRITE(AR5K_AR5212_KEYTABLE_MAC1(entry), htole32(high_id)); + AR5K_REG_WRITE(AR5K_AR5212_KEYTABLE_MAC0(entry), low_id); + AR5K_REG_WRITE(AR5K_AR5212_KEYTABLE_MAC1(entry), high_id); return (AH_TRUE); } |