From 86b23501ab7bb6fa28c53e056f6732d1c8921799 Mon Sep 17 00:00:00 2001 From: Pavel Roskin Date: Fri, 15 Jul 2011 19:06:27 -0400 Subject: [PATCH] --- yaml --- r: 258477 b: refs/heads/master c: d47d78dff4d6d72eec59dcdf0f6dd44064088112 h: refs/heads/master i: 258475: c93037b747896051696cf96f0a38b2508bde1ebd v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/ath/key.c | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 92de89ec1997..a8d6124c4947 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c54dcd197c3f9a66b60cb85ca50df06981a45211 +refs/heads/master: d47d78dff4d6d72eec59dcdf0f6dd44064088112 diff --git a/trunk/drivers/net/wireless/ath/key.c b/trunk/drivers/net/wireless/ath/key.c index a61ef3d6d89c..17b0efd86f9a 100644 --- a/trunk/drivers/net/wireless/ath/key.c +++ b/trunk/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;