Merge branch 'topic/hwdep-cleanup' into topic/hdsp

[linux-2.6-omap-h63xx.git] / drivers / net / wireless / ath5k / pcu.c

diff --git a/drivers/net/wireless/ath5k/pcu.c b/drivers/net/wireless/ath5k/pcu.c
index dabe42219e2a0b705fe27a08e5cec4aaed5365b8..75eb9f43c7417980266d2eb652f7ac5a9ad70580 100644 (file)
--- a/drivers/net/wireless/ath5k/pcu.c
+++ b/drivers/net/wireless/ath5k/pcu.c
@@ -65,7 +65,7 @@ int ath5k_hw_set_opmode(struct ath5k_hw *ah)
                if (ah->ah_version == AR5K_AR5210)
                        pcu_reg |= AR5K_STA_ID1_NO_PSPOLL;
                else
-                       AR5K_REG_DISABLE_BITS(ah, AR5K_CFG, AR5K_CFG_ADHOC);
+                       AR5K_REG_ENABLE_BITS(ah, AR5K_CFG, AR5K_CFG_IBSS);
                break;
 
        case NL80211_IFTYPE_AP:
@@ -75,7 +75,7 @@ int ath5k_hw_set_opmode(struct ath5k_hw *ah)
                if (ah->ah_version == AR5K_AR5210)
                        pcu_reg |= AR5K_STA_ID1_NO_PSPOLL;
                else
-                       AR5K_REG_ENABLE_BITS(ah, AR5K_CFG, AR5K_CFG_ADHOC);
+                       AR5K_REG_DISABLE_BITS(ah, AR5K_CFG, AR5K_CFG_IBSS);
                break;
 
        case NL80211_IFTYPE_STATION:
@@ -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];