diff options
| author | David S. Miller <davem@davemloft.net> | 2009-01-13 12:22:26 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-01-13 12:22:26 -0800 |
| commit | 9a0811ca4e9cf7be320ae8a5a43a259feb70074f (patch) | |
| tree | d8e0b2d1fcaa7e2da72d067fd7746b970bef457a /drivers/net/wireless/ath5k/pcu.c | |
| parent | 859975764fa61e927e7a69f46a55a4ba415785dd (diff) | |
| parent | 26d1597c9a4532eec74f9651c4c96483cb8892fe (diff) | |
| download | blackbird-obmc-linux-9a0811ca4e9cf7be320ae8a5a43a259feb70074f.tar.gz blackbird-obmc-linux-9a0811ca4e9cf7be320ae8a5a43a259feb70074f.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-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 0cac05c6a9ce..75eb9f43c741 100644 --- 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: |
