df7e5cbbf3c1c095750aadf4c8d7f8df85196ae2
[openwrt/svn-archive/archive.git] / package / mac80211 / patches / 531-ath9k_legacy_chainmask_fix.patch
1 --- a/drivers/net/wireless/ath/ath9k/ath9k.h
2 +++ b/drivers/net/wireless/ath/ath9k/ath9k.h
3 @@ -665,7 +665,6 @@ void ath9k_deinit_device(struct ath_soft
4 void ath9k_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw);
5 void ath9k_update_ichannel(struct ath_softc *sc, struct ieee80211_hw *hw,
6 struct ath9k_channel *ichan);
7 -void ath_update_chainmask(struct ath_softc *sc, int is_ht);
8 int ath_set_channel(struct ath_softc *sc, struct ieee80211_hw *hw,
9 struct ath9k_channel *hchan);
10
11 --- a/drivers/net/wireless/ath/ath9k/main.c
12 +++ b/drivers/net/wireless/ath/ath9k/main.c
13 @@ -538,32 +538,6 @@ set_timer:
14 }
15 }
16
17 -/*
18 - * Update tx/rx chainmask. For legacy association,
19 - * hard code chainmask to 1x1, for 11n association, use
20 - * the chainmask configuration, for bt coexistence, use
21 - * the chainmask configuration even in legacy mode.
22 - */
23 -void ath_update_chainmask(struct ath_softc *sc, int is_ht)
24 -{
25 - struct ath_hw *ah = sc->sc_ah;
26 - struct ath_common *common = ath9k_hw_common(ah);
27 -
28 - if ((sc->sc_flags & SC_OP_OFFCHANNEL) || is_ht ||
29 - (ah->btcoex_hw.scheme != ATH_BTCOEX_CFG_NONE)) {
30 - common->tx_chainmask = ah->caps.tx_chainmask;
31 - common->rx_chainmask = ah->caps.rx_chainmask;
32 - } else {
33 - common->tx_chainmask = 1;
34 - common->rx_chainmask = 1;
35 - }
36 -
37 - ath_dbg(common, ATH_DBG_CONFIG,
38 - "tx chmask: %d, rx chmask: %d\n",
39 - common->tx_chainmask,
40 - common->rx_chainmask);
41 -}
42 -
43 static void ath_node_attach(struct ath_softc *sc, struct ieee80211_sta *sta)
44 {
45 struct ath_node *an;
46 @@ -1676,8 +1650,6 @@ static int ath9k_config(struct ieee80211
47 /* XXX: remove me eventualy */
48 ath9k_update_ichannel(sc, hw, &sc->sc_ah->channels[pos]);
49
50 - ath_update_chainmask(sc, conf_is_ht(conf));
51 -
52 /* update survey stats for the old channel before switching */
53 spin_lock_irqsave(&common->cc_lock, flags);
54 ath_update_survey_stats(sc);
55 @@ -1909,10 +1881,6 @@ static void ath9k_bss_info_changed(struc
56 /* Set aggregation protection mode parameters */
57 sc->config.ath_aggr_prot = 0;
58
59 - /* Only legacy IBSS for now */
60 - if (vif->type == NL80211_IFTYPE_ADHOC)
61 - ath_update_chainmask(sc, 0);
62 -
63 ath_dbg(common, ATH_DBG_CONFIG, "BSSID: %pM aid: 0x%x\n",
64 common->curbssid, common->curaid);
65
66 --- a/drivers/net/wireless/ath/ath9k/virtual.c
67 +++ b/drivers/net/wireless/ath/ath9k/virtual.c
68 @@ -288,7 +288,6 @@ void ath9k_wiphy_chan_work(struct work_s
69 /* sync hw configuration for hw code */
70 common->hw = aphy->hw;
71
72 - ath_update_chainmask(sc, sc->chan_is_ht);
73 if (ath_set_channel(sc, aphy->hw,
74 &sc->sc_ah->channels[sc->chan_idx]) < 0) {
75 printk(KERN_DEBUG "ath9k: Failed to set channel for new "