diff options
| author | David S. Miller <davem@davemloft.net> | 2010-09-21 18:17:19 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-09-21 18:17:19 -0700 |
| commit | a0741ca949692904646c310573754859cba09bf1 (patch) | |
| tree | fc95067d8bfee5f6c6c747c74d1d6547d70199a3 /drivers/net/wireless/ath/ath9k/htc_drv_init.c | |
| parent | 9e2e8f14d48dbb6c31aeb739ae4fc8997b9dfe84 (diff) | |
| parent | b618f6f885579a6237e5bf4582fa6167972ddef4 (diff) | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/htc_drv_init.c')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/htc_drv_init.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_init.c b/drivers/net/wireless/ath/ath9k/htc_drv_init.c index 695e2b088d10..33850c952314 100644 --- a/drivers/net/wireless/ath/ath9k/htc_drv_init.c +++ b/drivers/net/wireless/ath/ath9k/htc_drv_init.c @@ -566,7 +566,7 @@ static void ath9k_init_crypto(struct ath9k_htc_priv *priv) * reset the contents on initial power up. */ for (i = 0; i < common->keymax; i++) - ath9k_hw_keyreset(priv->ah, (u16) i); + ath_hw_keyreset(common, (u16) i); } static void ath9k_init_channels_rates(struct ath9k_htc_priv *priv) @@ -601,8 +601,7 @@ static void ath9k_init_misc(struct ath9k_htc_priv *priv) common->tx_chainmask = priv->ah->caps.tx_chainmask; common->rx_chainmask = priv->ah->caps.rx_chainmask; - if (priv->ah->caps.hw_caps & ATH9K_HW_CAP_BSSIDMASK) - memcpy(common->bssidmask, ath_bcast_mac, ETH_ALEN); + memcpy(common->bssidmask, ath_bcast_mac, ETH_ALEN); priv->ah->opmode = NL80211_IFTYPE_STATION; } |