diff --git a/[refs] b/[refs] index 23241bc0ca5d..c4a5a5b0f7c3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 62d714e5ebec9ad4d63bb9a6da19dfd83d3db860 +refs/heads/master: 388cdf31db6dfc3d175786a76989266380e12c26 diff --git a/trunk/drivers/net/wireless/ath5k/pcu.c b/trunk/drivers/net/wireless/ath5k/pcu.c index dabe42219e2a..0cac05c6a9ce 100644 --- a/trunk/drivers/net/wireless/ath5k/pcu.c +++ b/trunk/drivers/net/wireless/ath5k/pcu.c @@ -1099,9 +1099,9 @@ int ath5k_hw_set_key(struct ath5k_hw *ah, u16 entry, if (ah->ah_combined_mic) { key_v[0] = rxmic[0]; - key_v[1] = (txmic[0] >> 16) & 0xffff; + key_v[1] = cpu_to_le32(le32_to_cpu(txmic[0]) >> 16); key_v[2] = rxmic[1]; - key_v[3] = txmic[0] & 0xffff; + key_v[3] = cpu_to_le32(le32_to_cpu(txmic[0]) & 0xffff); key_v[4] = txmic[1]; } else { key_v[0] = rxmic[0];