Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f59a59fe authored by Felix Fietkau's avatar Felix Fietkau Committed by John W. Linville
Browse files

ath9k: fix a regression in PS frame filter handling 



Only leave filtering enabled for AP or VLAN interfaces, clear the
destination mask for all other interfaces.

Signed-off-by: default avatarFelix Fietkau <nbd@openwrt.org>
Reported-by: default avatarBen Greear <greearb@candelatech.com>
Tested-by: default avatarBen Greear <greearb@candelatech.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 858a1652

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

+5 −0
Original line number Diff line number Diff line
@@ -1782,6 +1782,11 @@ static int ath9k_sta_add(struct ieee80211_hw *hw, 
	struct ieee80211_key_conf ps_key = { };



	ath_node_attach(sc, sta);



	if (vif->type != NL80211_IFTYPE_AP &&

	    vif->type != NL80211_IFTYPE_AP_VLAN)

		return 0;



	an->ps_key = ath_key_config(common, vif, sta, &ps_key);



	return 0;

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

+6 −0
Original line number Diff line number Diff line
@@ -1845,6 +1845,7 @@ int ath_tx_start(struct ieee80211_hw *hw, struct sk_buff *skb, 
	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;

	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);

	struct ieee80211_sta *sta = info->control.sta;

	struct ieee80211_vif *vif = info->control.vif;

	struct ath_softc *sc = hw->priv;

	struct ath_txq *txq = txctl->txq;

	struct ath_buf *bf;
@@ -1882,6 +1883,11 @@ int ath_tx_start(struct ieee80211_hw *hw, struct sk_buff *skb, 
		memmove(skb->data, skb->data + padsize, padpos);

	}



	if ((vif && vif->type != NL80211_IFTYPE_AP &&

	            vif->type != NL80211_IFTYPE_AP_VLAN) ||

	    !ieee80211_is_data(hdr->frame_control))

		info->flags |= IEEE80211_TX_CTL_CLEAR_PS_FILT;



	setup_frame_info(hw, skb, frmlen);



	/*