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

Commit e0645d9b authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'mac80211-for-davem-2018-03-21' of... 

Merge tag 'mac80211-for-davem-2018-03-21' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211



Johannes Berg says:

====================
Two more fixes (in three patches):
 * ath9k_htc doesn't like QoS NDP frames, use regular ones
 * hwsim: set up wmediumd for radios created later
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 40013ff2 60b01bcc

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

+1 −0
Original line number Diff line number Diff line
@@ -729,6 +729,7 @@ static void ath9k_set_hw_capab(struct ath9k_htc_priv *priv, 
	ieee80211_hw_set(hw, SPECTRUM_MGMT);

	ieee80211_hw_set(hw, SIGNAL_DBM);

	ieee80211_hw_set(hw, AMPDU_AGGREGATION);

	ieee80211_hw_set(hw, DOESNT_SUPPORT_QOS_NDP);



	if (ath9k_ps_enable)

		ieee80211_hw_set(hw, SUPPORTS_PS);

drivers/net/wireless/mac80211_hwsim.c

+1 −0
Original line number Diff line number Diff line
@@ -2727,6 +2727,7 @@ static int mac80211_hwsim_new_radio(struct genl_info *info, 
	mutex_init(&data->mutex);



	data->netgroup = hwsim_net_get_netgroup(net);

	data->wmediumd = hwsim_net_get_wmediumd(net);



	/* Enable frame retransmissions for lossy channels */

	hw->max_rates = 4;

include/net/mac80211.h

+4 −0
Original line number Diff line number Diff line
@@ -2063,6 +2063,9 @@ struct ieee80211_txq { 
 * @IEEE80211_HW_SUPPORTS_TDLS_BUFFER_STA: Hardware supports buffer STA on

 *	TDLS links.

 *

 * @IEEE80211_HW_DOESNT_SUPPORT_QOS_NDP: The driver (or firmware) doesn't

 *	support QoS NDP for AP probing - that's most likely a driver bug.

 *

 * @NUM_IEEE80211_HW_FLAGS: number of hardware flags, used for sizing arrays

 */

enum ieee80211_hw_flags {
@@ -2106,6 +2109,7 @@ enum ieee80211_hw_flags { 
	IEEE80211_HW_REPORTS_LOW_ACK,

	IEEE80211_HW_SUPPORTS_TX_FRAG,

	IEEE80211_HW_SUPPORTS_TDLS_BUFFER_STA,

	IEEE80211_HW_DOESNT_SUPPORT_QOS_NDP,



	/* keep last, obviously */

	NUM_IEEE80211_HW_FLAGS

net/mac80211/debugfs.c

+1 −0
Original line number Diff line number Diff line
@@ -212,6 +212,7 @@ static const char *hw_flag_names[] = { 
	FLAG(REPORTS_LOW_ACK),

	FLAG(SUPPORTS_TX_FRAG),

	FLAG(SUPPORTS_TDLS_BUFFER_STA),

	FLAG(DOESNT_SUPPORT_QOS_NDP),

#undef FLAG

};

net/mac80211/mlme.c

+2 −1
Original line number Diff line number Diff line
@@ -896,7 +896,8 @@ void ieee80211_send_nullfunc(struct ieee80211_local *local, 
	struct ieee80211_hdr_3addr *nullfunc;

	struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;



	skb = ieee80211_nullfunc_get(&local->hw, &sdata->vif, true);

	skb = ieee80211_nullfunc_get(&local->hw, &sdata->vif,

		!ieee80211_hw_check(&local->hw, DOESNT_SUPPORT_QOS_NDP));

	if (!skb)

		return;