Commit dd5ee59b authored by Sujith Manoharan's avatar Sujith Manoharan Committed by John W. Linville
Browse files

ath9k: Fix ATH9K_HW_CAP_HT usage 



There are a few places where the station's HT capabilities
should be checked instead of ATH9K_HW_CAP_HT, which is a global
feature for the driver. Fix this.

Signed-off-by: default avatarSujith Manoharan <c_manoha@qca.qualcomm.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 5d8eac3a

drivers/net/wireless/ath/ath9k/main.c

+5 −8
Original line number Diff line number Diff line
@@ -320,27 +320,24 @@ static void ath_node_attach(struct ath_softc *sc, struct ieee80211_sta *sta, 
			    struct ieee80211_vif *vif)

{

	struct ath_node *an;

	u8 density;

	an = (struct ath_node *)sta->drv_priv;



	an->sc = sc;

	an->sta = sta;

	an->vif = vif;



	if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_HT) {

	ath_tx_node_init(sc, an);



	if (sta->ht_cap.ht_supported) {

		an->maxampdu = 1 << (IEEE80211_HT_MAX_AMPDU_FACTOR +

				     sta->ht_cap.ampdu_factor);

		density = ath9k_parse_mpdudensity(sta->ht_cap.ampdu_density);

		an->mpdudensity = density;

		an->mpdudensity = ath9k_parse_mpdudensity(sta->ht_cap.ampdu_density);

	}

}



static void ath_node_detach(struct ath_softc *sc, struct ieee80211_sta *sta)

{

	struct ath_node *an = (struct ath_node *)sta->drv_priv;



	if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_HT)

	ath_tx_node_cleanup(sc, an);

}

drivers/net/wireless/ath/ath9k/xmit.c

+2 −3
Original line number Diff line number Diff line
@@ -1233,7 +1233,7 @@ int ath_tx_aggr_start(struct ath_softc *sc, struct ieee80211_sta *sta, 
	 * in HT IBSS when a beacon with HT-info is received after the station

	 * has already been added.

	 */

	if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_HT) {

	if (sta->ht_cap.ht_supported) {

		an->maxampdu = 1 << (IEEE80211_HT_MAX_AMPDU_FACTOR +

				     sta->ht_cap.ampdu_factor);

		density = ath9k_parse_mpdudensity(sta->ht_cap.ampdu_density);
@@ -1904,8 +1904,7 @@ static void ath_tx_start_dma(struct ath_softc *sc, struct sk_buff *skb, 
	struct ath_buf *bf;

	u8 tidno;



	if ((sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_HT) && txctl->an &&

		ieee80211_is_data_qos(hdr->frame_control)) {

	if (txctl->an && ieee80211_is_data_qos(hdr->frame_control)) {

		tidno = ieee80211_get_qos_ctl(hdr)[0] &

			IEEE80211_QOS_CTL_TID_MASK;

		tid = ATH_AN_2_TID(txctl->an, tidno);

CRA Git | Maintained and supported by SUSTech CRA and CCSE