lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ath9k_common: Move count_streams to common module

Browse Source 
This can be used by ath9k_htc.

Signed-off-by: Sujith <Sujith.Manoharan@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Sujith
2010-06-02 15:53:37 +05:30
committed by John W. Linville
parent b176286276
commit 61389f3ed4
3 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/net/wireless/ath/ath9k/common.c
View File

@@ -397,6 +397,19 @@ void ath9k_cmn_key_delete(struct ath_common *common,
} }
EXPORT_SYMBOL(ath9k_cmn_key_delete); EXPORT_SYMBOL(ath9k_cmn_key_delete);
int ath9k_cmn_count_streams(unsigned int chainmask, int max)
{
int streams = 0;
do {
if (++streams == max)
break;
} while ((chainmask = chainmask & (chainmask - 1)));
return streams;
}
EXPORT_SYMBOL(ath9k_cmn_count_streams);
static int __init ath9k_cmn_init(void) static int __init ath9k_cmn_init(void)
{ {
return 0; return 0;

1
drivers/net/wireless/ath/ath9k/common.h
View File

@@ -64,3 +64,4 @@ int ath9k_cmn_key_config(struct ath_common *common,
struct ieee80211_key_conf *key); struct ieee80211_key_conf *key);
void ath9k_cmn_key_delete(struct ath_common *common, void ath9k_cmn_key_delete(struct ath_common *common,
struct ieee80211_key_conf *key); struct ieee80211_key_conf *key);
int ath9k_cmn_count_streams(unsigned int chainmask, int max);

16
drivers/net/wireless/ath/ath9k/init.c
View File

@@ -175,18 +175,6 @@ static const struct ath_ops ath9k_common_ops = {
.write = ath9k_iowrite32, .write = ath9k_iowrite32,
}; };
static int count_streams(unsigned int chainmask, int max)
{
int streams = 0;
do {
if (++streams == max)
break;
} while ((chainmask = chainmask & (chainmask - 1)));
return streams;
}
/**************************/ /**************************/
/* Initialization */ /* Initialization */
/**************************/ /**************************/
@@ -227,8 +215,8 @@ static void setup_ht_cap(struct ath_softc *sc,
/* set up supported mcs set */ /* set up supported mcs set */
memset(&ht_info->mcs, 0, sizeof(ht_info->mcs)); memset(&ht_info->mcs, 0, sizeof(ht_info->mcs));
tx_streams = count_streams(common->tx_chainmask, max_streams); tx_streams = ath9k_cmn_count_streams(common->tx_chainmask, max_streams);
rx_streams = count_streams(common->rx_chainmask, max_streams); rx_streams = ath9k_cmn_count_streams(common->rx_chainmask, max_streams);
ath_print(common, ATH_DBG_CONFIG, ath_print(common, ATH_DBG_CONFIG,
"TX streams %d, RX streams: %d\n", "TX streams %d, RX streams: %d\n",