ath9k|ath9k_htc: remove code dups
cover ath9k|ath9k_htc: remove code dups
ath9k code moved to common-init.c and then reused in ath9k_htc.
Oleksij Rempel (7):
ath9k: move ath9k_init_channels_rates to common-init
ath9k_htc: use ath9k_cmn_init_channels_rates
ath9k: move setup_ht_cap to common-init
ath9k_htc: use ath9k_cmn_setup_ht_cap
ath9k-common: set maxstream=1 for ar9271
ath9k: move ath9k_reload_chainmask_settings to common
ath9k_htc: use ath9k_cmn_reload_chainmask
drivers/net/wireless/ath/ath.h | 1 + drivers/net/wireless/ath/ath9k/Makefile | 3 +- drivers/net/wireless/ath/ath9k/ath9k.h | 1 - drivers/net/wireless/ath/ath9k/beacon.c | 2 +- drivers/net/wireless/ath/ath9k/common-init.c | 244 ++++++++++++++++++++++++++ drivers/net/wireless/ath/ath9k/common-init.h | 20 +++ drivers/net/wireless/ath/ath9k/common.h | 2 + drivers/net/wireless/ath/ath9k/htc.h | 1 - drivers/net/wireless/ath/ath9k/htc_drv_init.c | 176 +------------------ drivers/net/wireless/ath/ath9k/init.c | 230 +----------------------- drivers/net/wireless/ath/ath9k/main.c | 2 +- drivers/net/wireless/ath/ath9k/xmit.c | 3 +- 12 files changed, 286 insertions(+), 399 deletions(-) create mode 100644 drivers/net/wireless/ath/ath9k/common-init.c create mode 100644 drivers/net/wireless/ath/ath9k/common-init.h
Signature · 1 line
1.9.0
PATCH 1/7 ath9k: move ath9k_init_channels_rates to common-init
and rename it to ath9k_cmn_init_channels_rates.
sbands are move to ath_common as well.
--- drivers/net/wireless/ath/ath.h | 1 + drivers/net/wireless/ath/ath9k/Makefile | 3 +- drivers/net/wireless/ath/ath9k/ath9k.h | 1 - drivers/net/wireless/ath/ath9k/beacon.c | 2 +- drivers/net/wireless/ath/ath9k/common-init.c | 170 ++++++++++++++++++++++++++ drivers/net/wireless/ath/ath9k/common-init.h | 17 +++ drivers/net/wireless/ath/ath9k/common.h | 2 + drivers/net/wireless/ath/ath9k/init.c | 172 ++------------------------- drivers/net/wireless/ath/ath9k/xmit.c | 3 +- 9 files changed, 208 insertions(+), 163 deletions(-) create mode 100644 drivers/net/wireless/ath/ath9k/common-init.c create mode 100644 drivers/net/wireless/ath/ath9k/common-init.h
drivers/net/wireless/ath/ath.h +1 -0
@@ -163,6 +163,7 @@ struct ath_common {bool bt_ant_diversity;int last_rssi; +struct ieee80211_supported_band sbands[IEEE80211_NUM_BANDS ]; }; struct sk_buff *ath_rxbuf_alloc(struct ath_common *common,
drivers/net/wireless/ath/ath9k/Makefile +2 -1
@@ -51,7 +51,8 @@ ath9k_hw-$(CONFIG_ATH9K_BTCOEX_SUPPORT) += btcoex.o \ obj-$(CONFIG_ATH9K_HW) += ath9k_hw.o obj-$(CONFIG_ATH9K_COMMON) += ath9k_common.o -ath9k_common-y:= common.o +ath9k_common-y:= common.o \ + common-init.o ath9k_htc-y += htc_hst.o \ hif_usb.o \
drivers/net/wireless/ath/ath9k/ath9k.h +0 -1
@@ -753,7 +753,6 @@ struct ath_softc {struct ath_rx rx;struct ath_tx tx;struct ath_beacon beacon; -struct ieee80211_supported_band sbands[IEEE80211_NUM_BANDS ];#ifdef CONFIG_MAC80211_LEDS bool led_registered;
drivers/net/wireless/ath/ath9k/beacon.c +1 -1
@@ -80,7 +80,7 @@ static void ath9k_beacon_setup(struct ath_softc *sc, struct ieee80211_vif *vif,u8 chainmask = ah->txchainmask;u8 rate =0 ; - sband = &sc->sbands[common->hw->conf.chandef.chan->band]; + sband = &common->sbands[common->hw->conf.chandef.chan->band]; rate = sband->bitrates[rateidx].hw_value;if (vif->bss_conf.use_short_preamble) rate |= sband->bitrates[rateidx].hw_value_short;
drivers/net/wireless/ath/ath9k/common-init.c new file +170 -0
170 lines not on this page · raw message
drivers/net/wireless/ath/ath9k/common-init.h new file +17 -0
@@ -0,0 +1,17 @@ +/* +* Copyright (c) 2009-2011 Atheros Communications Inc. +* +* Permission to use, copy, modify, and/or distribute this software for any +* purpose with or without fee is hereby granted, provided that the above +* copyright notice and this permission notice appear in all copies. +* +* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +*/ + +int ath9k_cmn_init_channels_rates (struct ath_common *common);
drivers/net/wireless/ath/ath9k/common.h +2 -0
@@ -21,6 +21,8 @@#include "hw.h" #include "hw-ops.h" +#include "common-init.h" +/* Common header for Atheros 802.11n base driver cores */ #define WME_BA_BMP_SIZE 64
drivers/net/wireless/ath/ath9k/init.c +13 -159
215 lines not on this page · raw message
drivers/net/wireless/ath/ath9k/xmit.c +2 -1
@@ -1076,6 +1076,7 @@ static void ath_buf_set_rate(struct ath_softc *sc, struct ath_buf *bf, struct ath_tx_info *info, int len, bool rts) { struct ath_hw *ah = sc->sc_ah; +struct ath_common *common =ath9k_hw_common (ah);struct sk_buff *skb;struct ieee80211_tx_info *tx_info;struct ieee80211_tx_rate *rates;
@@ -1145,7 +1146,7 @@ static void ath_buf_set_rate(struct ath_softc *sc, struct ath_buf *bf, }/* legacy rates */ - rate = &sc->sbands[tx_info->band].bitrates[rates[i].idx]; + rate = &common->sbands[tx_info->band].bitrates[rates[i].idx];if ((tx_info->band ==IEEE80211_BAND_2GHZ ) && !(rate->flags &IEEE80211_RATE_ERP_G )) phy =WLAN_RC_PHY_CCK ;
Signature · 1 line
1.9.0
PATCH 2/7 ath9k_htc: use ath9k_cmn_init_channels_rates
In reply to Oleksij Rempeland ath_common sbands.
--- drivers/net/wireless/ath/ath9k/htc.h | 1 - drivers/net/wireless/ath/ath9k/htc_drv_init.c | 123 ++------------------------ 2 files changed, 6 insertions(+), 118 deletions(-)
drivers/net/wireless/ath/ath9k/htc.h +0 -1
@@ -487,7 +487,6 @@ struct ath9k_htc_priv {unsigned long op_flags;struct ath9k_hw_cal_data caldata; -struct ieee80211_supported_band sbands[IEEE80211_NUM_BANDS ];spinlock_t beacon_lock;struct htc_beacon_config cur_beacon_conf;
drivers/net/wireless/ath/ath9k/htc_drv_init.c +6 -117
162 lines not on this page · raw message
Signature · 1 line
1.9.0
PATCH 3/7 ath9k: move setup_ht_cap to common-init
In reply to Oleksij Rempeland rename it to ath9k_cmn_setup_ht_cap
--- drivers/net/wireless/ath/ath9k/common-init.c | 58 ++++++++++++++++++++++++++ drivers/net/wireless/ath/ath9k/common-init.h | 2 + drivers/net/wireless/ath/ath9k/init.c | 62 +--------------------------- 3 files changed, 62 insertions(+), 60 deletions(-)
drivers/net/wireless/ath/ath9k/common-init.c +58 -0
@@ -168,3 +168,61 @@ int ath9k_cmn_init_channels_rates(struct ath_common *common)return 0 ; }EXPORT_SYMBOL (ath9k_cmn_init_channels_rates); + +void ath9k_cmn_setup_ht_cap (struct ath_hw *ah, +struct ieee80211_sta_ht_cap *ht_info) +{ +struct ath_common *common =ath9k_hw_common (ah); +u8 tx_streams, rx_streams; +int i, max_streams; + + ht_info->ht_supported = true; + ht_info->cap =IEEE80211_HT_CAP_SUP_WIDTH_20_40 | +IEEE80211_HT_CAP_SM_PS | +IEEE80211_HT_CAP_SGI_40 | +IEEE80211_HT_CAP_DSSSCCK40 ; + +if (ah->caps.hw_caps &ATH9K_HW_CAP_LDPC ) + ht_info->cap |=IEEE80211_HT_CAP_LDPC_CODING ; + +if (ah->caps.hw_caps &ATH9K_HW_CAP_SGI_20 ) + ht_info->cap |=IEEE80211_HT_CAP_SGI_20 ; + + ht_info->ampdu_factor =IEEE80211_HT_MAX_AMPDU_64K ; + ht_info->ampdu_density =IEEE80211_HT_MPDU_DENSITY_8 ; + +if (AR_SREV_9330 (ah) ||AR_SREV_9485 (ah) ||AR_SREV_9565 (ah)) + max_streams =1 ; +else if (AR_SREV_9462 (ah)) + max_streams =2 ; +else if (AR_SREV_9300_20_OR_LATER (ah)) + max_streams =3 ; +else + max_streams =2 ; + +if (AR_SREV_9280_20_OR_LATER (ah)) { +if (max_streams >=2 ) + ht_info->cap |=IEEE80211_HT_CAP_TX_STBC ; + ht_info->cap |= (1 <<IEEE80211_HT_CAP_RX_STBC_SHIFT ); + } + +/* set up supported mcs set */ +memset (&ht_info->mcs,0 ,sizeof (ht_info->mcs)); + tx_streams =ath9k_cmn_count_streams (ah->txchainmask, max_streams); + rx_streams =ath9k_cmn_count_streams (ah->rxchainmask, max_streams); + +ath_dbg (common,CONFIG ,"TX streams %d, RX streams: %d\n" , + tx_streams, rx_streams); + +if (tx_streams != rx_streams) { + ht_info->mcs.tx_params |=IEEE80211_HT_MCS_TX_RX_DIFF ; + ht_info->mcs.tx_params |= ((tx_streams -1 ) << +IEEE80211_HT_MCS_TX_MAX_STREAMS_SHIFT ); + } + +for (i =0 ; i < rx_streams; i++) + ht_info->mcs.rx_mask[i] =0xff ; + + ht_info->mcs.tx_params |=IEEE80211_HT_MCS_TX_DEFINED ; +} +EXPORT_SYMBOL (ath9k_cmn_setup_ht_cap);
drivers/net/wireless/ath/ath9k/common-init.h +2 -0
@@ -15,3 +15,5 @@*/ int ath9k_cmn_init_channels_rates (struct ath_common *common); +void ath9k_cmn_setup_ht_cap (struct ath_hw *ah, +struct ieee80211_sta_ht_cap *ht_info);
drivers/net/wireless/ath/ath9k/init.c +2 -60
75 lines not on this page · raw message
Signature · 1 line
1.9.0
PATCH 4/7 ath9k_htc: use ath9k_cmn_setup_ht_cap
In reply to Oleksij Rempel--- drivers/net/wireless/ath/ath9k/htc_drv_init.c | 50 ++------------------------- 1 file changed, 3 insertions(+), 47 deletions(-)
drivers/net/wireless/ath/ath9k/htc_drv_init.c +3 -47
@@ -404,51 +404,6 @@ static const struct ath_bus_ops ath9k_usb_bus_ops = { .eeprom_read = ath_usb_eeprom_read, }; -static void setup_ht_cap (struct ath9k_htc_priv *priv, -struct ieee80211_sta_ht_cap *ht_info) -{ -struct ath_common *common =ath9k_hw_common (priv->ah); -u8 tx_streams, rx_streams; -int i; - - ht_info->ht_supported = true; - ht_info->cap =IEEE80211_HT_CAP_SUP_WIDTH_20_40 | -IEEE80211_HT_CAP_SM_PS | -IEEE80211_HT_CAP_SGI_40 | -IEEE80211_HT_CAP_DSSSCCK40 ; - -if (priv->ah->caps.hw_caps &ATH9K_HW_CAP_SGI_20 ) - ht_info->cap |=IEEE80211_HT_CAP_SGI_20 ; - - ht_info->cap |= (1 <<IEEE80211_HT_CAP_RX_STBC_SHIFT ); - - ht_info->ampdu_factor =IEEE80211_HT_MAX_AMPDU_64K ; - ht_info->ampdu_density =IEEE80211_HT_MPDU_DENSITY_8 ; - -memset (&ht_info->mcs,0 ,sizeof (ht_info->mcs)); - -/* ath9k_htc supports only 1 or 2 stream devices */ - tx_streams =ath9k_cmn_count_streams (priv->ah->txchainmask,2 ); - rx_streams =ath9k_cmn_count_streams (priv->ah->rxchainmask,2 ); - -ath_dbg (common,CONFIG ,"TX streams %d, RX streams: %d\n" , - tx_streams, rx_streams); - -if (tx_streams >=2 ) - ht_info->cap |=IEEE80211_HT_CAP_TX_STBC ; - -if (tx_streams != rx_streams) { - ht_info->mcs.tx_params |=IEEE80211_HT_MCS_TX_RX_DIFF ; - ht_info->mcs.tx_params |= ((tx_streams -1 ) << -IEEE80211_HT_MCS_TX_MAX_STREAMS_SHIFT ); - } - -for (i =0 ; i < rx_streams; i++) - ht_info->mcs.rx_mask[i] =0xff ; - - ht_info->mcs.tx_params |=IEEE80211_HT_MCS_TX_DEFINED ; -} -static int ath9k_init_queues (struct ath9k_htc_priv *priv) {struct ath_common *common =ath9k_hw_common (priv->ah);
@@ -611,6 +566,7 @@ static const struct ieee80211_iface_combination if_comb = {static void ath9k_set_hw_capab (struct ath9k_htc_priv *priv,struct ieee80211_hw *hw) { +struct ath_hw *ah = priv->ah;struct ath_common *common =ath9k_hw_common (priv->ah);struct base_eep_header *pBase;
@@ -662,10 +618,10 @@ static void ath9k_set_hw_capab(struct ath9k_htc_priv *priv,if (priv->ah->caps.hw_caps &ATH9K_HW_CAP_HT ) {if (priv->ah->caps.hw_caps &ATH9K_HW_CAP_2GHZ ) -setup_ht_cap (priv, +ath9k_cmn_setup_ht_cap (ah, &common->sbands[IEEE80211_BAND_2GHZ ].ht_cap);if (priv->ah->caps.hw_caps &ATH9K_HW_CAP_5GHZ ) -setup_ht_cap (priv, +ath9k_cmn_setup_ht_cap (ah, &common->sbands[IEEE80211_BAND_5GHZ ].ht_cap); }
Signature · 1 line
1.9.0
PATCH 5/7 ath9k-common: set maxstream=1 for ar9271
In reply to Oleksij Rempel--- drivers/net/wireless/ath/ath9k/common-init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/ath/ath9k/common-init.c +1 -1
@@ -191,7 +191,7 @@ void ath9k_cmn_setup_ht_cap(struct ath_hw *ah, ht_info->ampdu_factor =IEEE80211_HT_MAX_AMPDU_64K ; ht_info->ampdu_density =IEEE80211_HT_MPDU_DENSITY_8 ; -if (AR_SREV_9330 (ah) ||AR_SREV_9485 (ah) ||AR_SREV_9565 (ah)) +if (AR_SREV_9271 (ah) ||AR_SREV_9330 (ah) ||AR_SREV_9485 (ah) ||AR_SREV_9565 (ah)) max_streams =1 ;else if (AR_SREV_9462 (ah)) max_streams =2 ;
Signature · 1 line
1.9.0
PATCH 6/7 ath9k: move ath9k_reload_chainmask_settings to common
In reply to Oleksij Rempel--- drivers/net/wireless/ath/ath9k/common-init.c | 16 ++++++++++++++++ drivers/net/wireless/ath/ath9k/common-init.h | 1 + drivers/net/wireless/ath/ath9k/init.c | 16 +--------------- drivers/net/wireless/ath/ath9k/main.c | 2 +- 4 files changed, 19 insertions(+), 16 deletions(-)
drivers/net/wireless/ath/ath9k/common-init.c +16 -0
@@ -226,3 +226,19 @@ void ath9k_cmn_setup_ht_cap(struct ath_hw *ah, ht_info->mcs.tx_params |=IEEE80211_HT_MCS_TX_DEFINED ; }EXPORT_SYMBOL (ath9k_cmn_setup_ht_cap); + +void ath9k_cmn_reload_chainmask (struct ath_hw *ah) +{ +struct ath_common *common =ath9k_hw_common (ah); + +if (!(ah->caps.hw_caps &ATH9K_HW_CAP_HT )) +return ; + +if (ah->caps.hw_caps &ATH9K_HW_CAP_2GHZ ) +ath9k_cmn_setup_ht_cap (ah, + &common->sbands[IEEE80211_BAND_2GHZ ].ht_cap); +if (ah->caps.hw_caps &ATH9K_HW_CAP_5GHZ ) +ath9k_cmn_setup_ht_cap (ah, + &common->sbands[IEEE80211_BAND_5GHZ ].ht_cap); +} +EXPORT_SYMBOL (ath9k_cmn_reload_chainmask);
drivers/net/wireless/ath/ath9k/common-init.h +1 -0
@@ -17,3 +17,4 @@int ath9k_cmn_init_channels_rates (struct ath_common *common);void ath9k_cmn_setup_ht_cap (struct ath_hw *ah,struct ieee80211_sta_ht_cap *ht_info); +void ath9k_cmn_reload_chainmask (struct ath_hw *ah);
drivers/net/wireless/ath/ath9k/init.c +1 -15
@@ -642,20 +642,6 @@ static void ath9k_init_txpower_limits(struct ath_softc *sc) ah->curchan = curchan; } -void ath9k_reload_chainmask_settings (struct ath_softc *sc) -{ -struct ath_hw *ah = sc->sc_ah; -struct ath_common *common =ath9k_hw_common (ah); - -if (!(ah->caps.hw_caps &ATH9K_HW_CAP_HT )) -return ; - -if (ah->caps.hw_caps &ATH9K_HW_CAP_2GHZ ) -ath9k_cmn_setup_ht_cap (ah, &common->sbands[IEEE80211_BAND_2GHZ ].ht_cap); -if (ah->caps.hw_caps &ATH9K_HW_CAP_5GHZ ) -ath9k_cmn_setup_ht_cap (ah, &common->sbands[IEEE80211_BAND_5GHZ ].ht_cap); -} -static const struct ieee80211_iface_limit if_limits[] = { { .max =2048 , .types =BIT (NL80211_IFTYPE_STATION ) | BIT(NL80211_IFTYPE_P2P_CLIENT) |
@@ -771,7 +757,7 @@ static void ath9k_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw) &common->sbands[IEEE80211_BAND_5GHZ ];ath9k_init_wow (hw); -ath9k_reload_chainmask_settings (sc); +ath9k_cmn_reload_chainmask (ah);SET_IEEE80211_PERM_ADDR (hw, common->macaddr); }
drivers/net/wireless/ath/ath9k/main.c +1 -1
@@ -2053,7 +2053,7 @@ static int ath9k_set_antenna(struct ieee80211_hw *hw, u32 tx_ant, u32 rx_ant) ah->rxchainmask =fill_chainmask (ah->caps.rx_chainmask, rx_ant); ah->txchainmask =fill_chainmask (ah->caps.tx_chainmask, tx_ant); -ath9k_reload_chainmask_settings (sc); +ath9k_cmn_reload_chainmask (ah);return 0 ; }
Signature · 1 line
1.9.0
PATCH 7/7 ath9k_htc: use ath9k_cmn_reload_chainmask
In reply to Oleksij Rempel--- drivers/net/wireless/ath/ath9k/htc_drv_init.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-)
drivers/net/wireless/ath/ath9k/htc_drv_init.c +1 -8
@@ -616,14 +616,7 @@ static void ath9k_set_hw_capab(struct ath9k_htc_priv *priv, hw->wiphy->bands[IEEE80211_BAND_5GHZ ] = &common->sbands[IEEE80211_BAND_5GHZ ]; -if (priv->ah->caps.hw_caps &ATH9K_HW_CAP_HT ) { -if (priv->ah->caps.hw_caps &ATH9K_HW_CAP_2GHZ ) -ath9k_cmn_setup_ht_cap (ah, - &common->sbands[IEEE80211_BAND_2GHZ ].ht_cap); -if (priv->ah->caps.hw_caps &ATH9K_HW_CAP_5GHZ ) -ath9k_cmn_setup_ht_cap (ah, - &common->sbands[IEEE80211_BAND_5GHZ ].ht_cap); - } +ath9k_cmn_reload_chainmask (ah); pBase =ath9k_htc_get_eeprom_base (priv);if (pBase) {
Signature · 1 line
1.9.0
cover ath9k|ath9k_htc: remove code dups
In reply to Oleksij RempelHi Sujith,
i need you ACK btw NACK :)
Am 25.02.2014 14:48, schrieb Oleksij Rempel:
Quoted 27 lines
ath9k code moved to
common-init.cand then reused inath9k_htc.Oleksij Rempel (7):
ath9k: moveath9k_init_channels_ratesto common-init
ath9k_htc: useath9k_cmn_init_channels_rates
ath9k: movesetup_ht_capto common-init
ath9k_htc: useath9k_cmn_setup_ht_cap
ath9k-common: set maxstream=1 for ar9271
ath9k: moveath9k_reload_chainmask_settingsto common
ath9k_htc: useath9k_cmn_reload_chainmaskdrivers/net/wireless/ath/ath.h | 1 + drivers/net/wireless/ath/ath9k/Makefile | 3 +- drivers/net/wireless/ath/ath9k/ath9k.h | 1 - drivers/net/wireless/ath/ath9k/beacon.c | 2 +- drivers/net/wireless/ath/ath9k/common-init.c | 244 ++++++++++++++++++++++++++ drivers/net/wireless/ath/ath9k/common-init.h | 20 +++ drivers/net/wireless/ath/ath9k/common.h | 2 + drivers/net/wireless/ath/ath9k/htc.h | 1 - drivers/net/wireless/ath/ath9k/htc_drv_init.c | 176 +------------------ drivers/net/wireless/ath/ath9k/init.c | 230 +----------------------- drivers/net/wireless/ath/ath9k/main.c | 2 +- drivers/net/wireless/ath/ath9k/xmit.c | 3 +- 12 files changed, 286 insertions(+), 399 deletions(-) create mode 100644 drivers/net/wireless/ath/ath9k/common-init.c create mode 100644 drivers/net/wireless/ath/ath9k/common-init.h
Signature · 10 lines
Regards, Oleksij -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 278 bytes Desc: OpenPGP digital signature Url : http://lists.ath9k.org/pipermail/ath9k-devel/attachments/20140226/8fd6c0a4/attachment-0001.pgp
cover ath9k|ath9k_htc: remove code dups
In reply to Oleksij RempelQuoted 10 lines · Oleksij Rempel
ath9k code moved to
common-init.cand then reused inath9k_htc.Oleksij Rempel (7):
ath9k: moveath9k_init_channels_ratesto common-init
ath9k_htc: useath9k_cmn_init_channels_rates
ath9k: movesetup_ht_capto common-init
ath9k_htc: useath9k_cmn_setup_ht_cap
ath9k-common: set maxstream=1 for ar9271
ath9k: moveath9k_reload_chainmask_settingsto common
ath9k_htc: useath9k_cmn_reload_chainmask
This series looks good.
Sujith