Commit e948ed04 authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git 

ath.git patches for v5.8. Major changes:

ath9k

* allow receive of broadcast Action frames

ath9k_htc

* allow receive of broadcast Action frames
parents 6bb986e9 37b76986

drivers/net/wireless/ath/ath10k/qmi.h

+0 −1
Original line number Diff line number Diff line
@@ -115,7 +115,6 @@ int ath10k_qmi_wlan_enable(struct ath10k *ar, 
			   enum wlfw_driver_mode_enum_v01 mode,

			   const char *version);

int ath10k_qmi_wlan_disable(struct ath10k *ar);

int ath10k_qmi_register_service_notifier(struct notifier_block *nb);

int ath10k_qmi_init(struct ath10k *ar, u32 msa_size);

int ath10k_qmi_deinit(struct ath10k *ar);

int ath10k_qmi_set_fw_log_mode(struct ath10k *ar, u8 fw_log_mode);

drivers/net/wireless/ath/ath11k/mac.c

+3 −1
Original line number Diff line number Diff line
@@ -3562,7 +3562,7 @@ static int ath11k_mac_copy_he_cap(struct ath11k *ar, 
		memcpy(he_cap_elem->phy_cap_info, band_cap->he_cap_phy_info,

		       sizeof(he_cap_elem->phy_cap_info));



		he_cap_elem->mac_cap_info[1] |=

		he_cap_elem->mac_cap_info[1] &=

			IEEE80211_HE_MAC_CAP1_TF_MAC_PAD_DUR_MASK;

		he_cap_elem->phy_cap_info[4] &=

			~IEEE80211_HE_PHY_CAP4_BEAMFORMEE_MAX_STS_UNDER_80MHZ_MASK;
@@ -3578,6 +3578,8 @@ static int ath11k_mac_copy_he_cap(struct ath11k *ar, 


		switch (i) {

		case NL80211_IFTYPE_AP:

			he_cap_elem->phy_cap_info[3] &=

				~IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_TX_MASK;

			he_cap_elem->phy_cap_info[9] |=

				IEEE80211_HE_PHY_CAP9_RX_1024_QAM_LESS_THAN_242_TONE_RU;

			break;

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

+2 −0
Original line number Diff line number Diff line
@@ -780,6 +780,8 @@ static void ath9k_set_hw_capab(struct ath9k_htc_priv *priv, 
	SET_IEEE80211_PERM_ADDR(hw, common->macaddr);



	wiphy_ext_feature_set(hw->wiphy, NL80211_EXT_FEATURE_CQM_RSSI_LIST);

	wiphy_ext_feature_set(hw->wiphy,

			      NL80211_EXT_FEATURE_MULTICAST_REGISTRATIONS);

}



static int ath9k_init_firmware_version(struct ath9k_htc_priv *priv)

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

+1 −0
Original line number Diff line number Diff line
@@ -1251,6 +1251,7 @@ out: 
	FIF_OTHER_BSS |				\

	FIF_BCN_PRBRESP_PROMISC |		\

	FIF_PROBE_REQ |				\

	FIF_MCAST_ACTION |			\

	FIF_FCSFAIL)



static void ath9k_htc_configure_filter(struct ieee80211_hw *hw,

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

+2 −1
Original line number Diff line number Diff line
@@ -893,7 +893,8 @@ u32 ath9k_htc_calcrxfilter(struct ath9k_htc_priv *priv) 
	if (priv->rxfilter & FIF_PSPOLL)

		rfilt |= ATH9K_RX_FILTER_PSPOLL;



	if (priv->nvifs > 1 || priv->rxfilter & FIF_OTHER_BSS)

	if (priv->nvifs > 1 ||

	    priv->rxfilter & (FIF_OTHER_BSS | FIF_MCAST_ACTION))

		rfilt |= ATH9K_RX_FILTER_MCAST_BCAST_ALL;



	return rfilt;

CRA Git | Maintained and supported by SUSTech CRA and CCSE