summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPavel Roskin <proski@gnu.org>2011-07-15 23:06:27 (GMT)
committerJohn W. Linville <linville@tuxdriver.com>2011-07-18 18:29:41 (GMT)
commitd47d78dff4d6d72eec59dcdf0f6dd44064088112 (patch)
tree0373a20a02e9ef7d0f6120a095129358242d29f5
parentc54dcd197c3f9a66b60cb85ca50df06981a45211 (diff)
downloadlinux-d47d78dff4d6d72eec59dcdf0f6dd44064088112.tar.xz
ath: use get_unaligned_le{16,32} in ath_hw_keysetmac()
Signed-off-by: Pavel Roskin <proski@gnu.org> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/ath/key.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/net/wireless/ath/key.c b/drivers/net/wireless/ath/key.c
index a61ef3d6..17b0efd 100644
--- a/drivers/net/wireless/ath/key.c
+++ b/drivers/net/wireless/ath/key.c
@@ -105,11 +105,8 @@ static bool ath_hw_keysetmac(struct ath_common *common,
if (mac[0] & 0x01)
unicast_flag = 0;
- macHi = (mac[5] << 8) | mac[4];
- macLo = (mac[3] << 24) |
- (mac[2] << 16) |
- (mac[1] << 8) |
- mac[0];
+ macLo = get_unaligned_le32(mac);
+ macHi = get_unaligned_le16(mac + 4);
macLo >>= 1;
macLo |= (macHi & 1) << 31;
macHi >>= 1;