Skip to content

Commit e948ed0

Browse files
author
Kalle Valo
committed
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
2 parents 6bb986e + 37b7698 commit e948ed0

File tree

8 files changed

+13
-4
lines changed

8 files changed

+13
-4
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,6 @@ int ath10k_qmi_wlan_enable(struct ath10k *ar,
115115
enum wlfw_driver_mode_enum_v01 mode,
116116
const char *version);
117117
int ath10k_qmi_wlan_disable(struct ath10k *ar);
118-
int ath10k_qmi_register_service_notifier(struct notifier_block *nb);
119118
int ath10k_qmi_init(struct ath10k *ar, u32 msa_size);
120119
int ath10k_qmi_deinit(struct ath10k *ar);
121120
int ath10k_qmi_set_fw_log_mode(struct ath10k *ar, u8 fw_log_mode);

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3562,7 +3562,7 @@ static int ath11k_mac_copy_he_cap(struct ath11k *ar,
35623562
memcpy(he_cap_elem->phy_cap_info, band_cap->he_cap_phy_info,
35633563
sizeof(he_cap_elem->phy_cap_info));
35643564

3565-
he_cap_elem->mac_cap_info[1] |=
3565+
he_cap_elem->mac_cap_info[1] &=
35663566
IEEE80211_HE_MAC_CAP1_TF_MAC_PAD_DUR_MASK;
35673567
he_cap_elem->phy_cap_info[4] &=
35683568
~IEEE80211_HE_PHY_CAP4_BEAMFORMEE_MAX_STS_UNDER_80MHZ_MASK;
@@ -3578,6 +3578,8 @@ static int ath11k_mac_copy_he_cap(struct ath11k *ar,
35783578

35793579
switch (i) {
35803580
case NL80211_IFTYPE_AP:
3581+
he_cap_elem->phy_cap_info[3] &=
3582+
~IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_TX_MASK;
35813583
he_cap_elem->phy_cap_info[9] |=
35823584
IEEE80211_HE_PHY_CAP9_RX_1024_QAM_LESS_THAN_242_TONE_RU;
35833585
break;

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -780,6 +780,8 @@ static void ath9k_set_hw_capab(struct ath9k_htc_priv *priv,
780780
SET_IEEE80211_PERM_ADDR(hw, common->macaddr);
781781

782782
wiphy_ext_feature_set(hw->wiphy, NL80211_EXT_FEATURE_CQM_RSSI_LIST);
783+
wiphy_ext_feature_set(hw->wiphy,
784+
NL80211_EXT_FEATURE_MULTICAST_REGISTRATIONS);
783785
}
784786

785787
static int ath9k_init_firmware_version(struct ath9k_htc_priv *priv)

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1251,6 +1251,7 @@ static int ath9k_htc_config(struct ieee80211_hw *hw, u32 changed)
12511251
FIF_OTHER_BSS | \
12521252
FIF_BCN_PRBRESP_PROMISC | \
12531253
FIF_PROBE_REQ | \
1254+
FIF_MCAST_ACTION | \
12541255
FIF_FCSFAIL)
12551256

12561257
static void ath9k_htc_configure_filter(struct ieee80211_hw *hw,

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -893,7 +893,8 @@ u32 ath9k_htc_calcrxfilter(struct ath9k_htc_priv *priv)
893893
if (priv->rxfilter & FIF_PSPOLL)
894894
rfilt |= ATH9K_RX_FILTER_PSPOLL;
895895

896-
if (priv->nvifs > 1 || priv->rxfilter & FIF_OTHER_BSS)
896+
if (priv->nvifs > 1 ||
897+
priv->rxfilter & (FIF_OTHER_BSS | FIF_MCAST_ACTION))
897898
rfilt |= ATH9K_RX_FILTER_MCAST_BCAST_ALL;
898899

899900
return rfilt;

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1012,6 +1012,8 @@ static void ath9k_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw)
10121012

10131013
wiphy_ext_feature_set(hw->wiphy, NL80211_EXT_FEATURE_CQM_RSSI_LIST);
10141014
wiphy_ext_feature_set(hw->wiphy, NL80211_EXT_FEATURE_AIRTIME_FAIRNESS);
1015+
wiphy_ext_feature_set(hw->wiphy,
1016+
NL80211_EXT_FEATURE_MULTICAST_REGISTRATIONS);
10151017
}
10161018

10171019
int ath9k_init_device(u16 devid, struct ath_softc *sc,

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1476,6 +1476,7 @@ static int ath9k_config(struct ieee80211_hw *hw, u32 changed)
14761476
FIF_OTHER_BSS | \
14771477
FIF_BCN_PRBRESP_PROMISC | \
14781478
FIF_PROBE_REQ | \
1479+
FIF_MCAST_ACTION | \
14791480
FIF_FCSFAIL)
14801481

14811482
/* FIXME: sc->sc_full_reset ? */

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,8 @@ u32 ath_calcrxfilter(struct ath_softc *sc)
413413
if (sc->cur_chandef.width != NL80211_CHAN_WIDTH_20_NOHT)
414414
rfilt |= ATH9K_RX_FILTER_COMP_BAR;
415415

416-
if (sc->cur_chan->nvifs > 1 || (sc->cur_chan->rxfilter & FIF_OTHER_BSS)) {
416+
if (sc->cur_chan->nvifs > 1 ||
417+
(sc->cur_chan->rxfilter & (FIF_OTHER_BSS | FIF_MCAST_ACTION))) {
417418
/* This is needed for older chips */
418419
if (sc->sc_ah->hw_version.macVersion <= AR_SREV_VERSION_9160)
419420
rfilt |= ATH9K_RX_FILTER_PROM;

0 commit comments

Comments
 (0)