diff options
| author | David S. Miller <davem@davemloft.net> | 2008-12-12 22:20:51 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-12-12 22:20:51 -0800 |
| commit | 56bde885903bdb9d9531fd569096ec8c7a2d60ee (patch) | |
| tree | dcb9428e525b3c57aea00706fa969805251de444 /drivers/net/wireless/ath5k/pcu.c | |
| parent | a7a81fc060f050ad4ba7f6ef5cdc583dad2f7b21 (diff) | |
| parent | a7b75207bd37cbbfa0b4ee7dbaf0dc6bafec8fea (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/ath5k/pcu.c')
| -rw-r--r-- | drivers/net/wireless/ath5k/pcu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath5k/pcu.c b/drivers/net/wireless/ath5k/pcu.c index dabe42219e2..0cac05c6a9c 100644 --- a/drivers/net/wireless/ath5k/pcu.c +++ b/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]; |