diff options
author | Rajkumar Manoharan <rmanohar@qca.qualcomm.com> | 2011-08-13 00:58:15 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-08-24 13:59:45 -0400 |
commit | f82b4bde17aeb6c2f8bf0540ee44811de4651cf6 (patch) | |
tree | 00ea645c48534e8e66261d432a862d5a5762c266 /drivers/net/wireless/ath/ath9k/htc_drv_init.c | |
parent | d77bf3eb5160c1356d7d7620b7d2fbe28e5e6257 (diff) |
ath9k: Move ath9k_init_crypto to common
Signed-off-by: Rajkumar Manoharan <rmanohar@qca.qualcomm.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/htc_drv_init.c')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/htc_drv_init.c | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_init.c b/drivers/net/wireless/ath/ath9k/htc_drv_init.c index 19aa5b724887..9cf42f6973aa 100644 --- a/drivers/net/wireless/ath/ath9k/htc_drv_init.c +++ b/drivers/net/wireless/ath/ath9k/htc_drv_init.c | |||
@@ -572,25 +572,6 @@ err: | |||
572 | return -EINVAL; | 572 | return -EINVAL; |
573 | } | 573 | } |
574 | 574 | ||
575 | static void ath9k_init_crypto(struct ath9k_htc_priv *priv) | ||
576 | { | ||
577 | struct ath_common *common = ath9k_hw_common(priv->ah); | ||
578 | int i = 0; | ||
579 | |||
580 | /* Get the hardware key cache size. */ | ||
581 | common->keymax = AR_KEYTABLE_SIZE; | ||
582 | |||
583 | if (priv->ah->misc_mode & AR_PCU_MIC_NEW_LOC_ENA) | ||
584 | common->crypt_caps |= ATH_CRYPT_CAP_MIC_COMBINED; | ||
585 | |||
586 | /* | ||
587 | * Reset the key cache since some parts do not | ||
588 | * reset the contents on initial power up. | ||
589 | */ | ||
590 | for (i = 0; i < common->keymax; i++) | ||
591 | ath_hw_keyreset(common, (u16) i); | ||
592 | } | ||
593 | |||
594 | static void ath9k_init_channels_rates(struct ath9k_htc_priv *priv) | 575 | static void ath9k_init_channels_rates(struct ath9k_htc_priv *priv) |
595 | { | 576 | { |
596 | if (priv->ah->caps.hw_caps & ATH9K_HW_CAP_2GHZ) { | 577 | if (priv->ah->caps.hw_caps & ATH9K_HW_CAP_2GHZ) { |
@@ -720,7 +701,7 @@ static int ath9k_init_priv(struct ath9k_htc_priv *priv, | |||
720 | for (i = 0; i < ATH9K_HTC_MAX_BCN_VIF; i++) | 701 | for (i = 0; i < ATH9K_HTC_MAX_BCN_VIF; i++) |
721 | priv->cur_beacon_conf.bslot[i] = NULL; | 702 | priv->cur_beacon_conf.bslot[i] = NULL; |
722 | 703 | ||
723 | ath9k_init_crypto(priv); | 704 | ath9k_cmn_init_crypto(ah); |
724 | ath9k_init_channels_rates(priv); | 705 | ath9k_init_channels_rates(priv); |
725 | ath9k_init_misc(priv); | 706 | ath9k_init_misc(priv); |
726 | 707 | ||