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

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

Merge tag 'mac80211-for-davem-2019-04-09' of... 

Merge tag 'mac80211-for-davem-2019-04-09' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211



Johannes Berg says:

====================
Various fixes:
 * iTXQ fixes from Felix
 * tracing fix - increase message length
 * fix SW_CRYPTO_CONTROL enforcement
 * WMM rule handling for regdomain intersection
 * max_interfaces in hwsim - reported by syzbot
 * clear private data in some more commands
 * a clang compiler warning fix

I added a patch with two new (unused) macros for
rate-limited printing to simplify getting the users
into the tree.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 869e3305 78ad2341

drivers/net/wireless/ath/ath10k/htt_rx.c

+1 −1
Original line number Diff line number Diff line
@@ -2728,7 +2728,7 @@ static void ath10k_htt_rx_tx_fetch_ind(struct ath10k *ar, struct sk_buff *skb) 
			num_msdus++;

			num_bytes += ret;

		}

		ieee80211_return_txq(hw, txq);

		ieee80211_return_txq(hw, txq, false);

		ieee80211_txq_schedule_end(hw, txq->ac);



		record->num_msdus = cpu_to_le16(num_msdus);

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

+2 −2
Original line number Diff line number Diff line
@@ -4089,7 +4089,7 @@ static int ath10k_mac_schedule_txq(struct ieee80211_hw *hw, u32 ac) 
			if (ret < 0)

				break;

		}

		ieee80211_return_txq(hw, txq);

		ieee80211_return_txq(hw, txq, false);

		ath10k_htt_tx_txq_update(hw, txq);

		if (ret == -EBUSY)

			break;
@@ -4374,7 +4374,7 @@ static void ath10k_mac_op_wake_tx_queue(struct ieee80211_hw *hw, 
		if (ret < 0)

			break;

	}

	ieee80211_return_txq(hw, txq);

	ieee80211_return_txq(hw, txq, false);

	ath10k_htt_tx_txq_update(hw, txq);

out:

	ieee80211_txq_schedule_end(hw, ac);

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

+4 −1
Original line number Diff line number Diff line
@@ -1938,12 +1938,15 @@ void ath_txq_schedule(struct ath_softc *sc, struct ath_txq *txq) 
		goto out;



	while ((queue = ieee80211_next_txq(hw, txq->mac80211_qnum))) {

		bool force;



		tid = (struct ath_atx_tid *)queue->drv_priv;



		ret = ath_tx_sched_aggr(sc, txq, tid);

		ath_dbg(common, QUEUE, "ath_tx_sched_aggr returned %d\n", ret);



		ieee80211_return_txq(hw, queue);

		force = !skb_queue_empty(&tid->retry_q);

		ieee80211_return_txq(hw, queue, force);

	}



out:

drivers/net/wireless/mac80211_hwsim.c

+15 −4
Original line number Diff line number Diff line
@@ -2644,7 +2644,7 @@ static int mac80211_hwsim_new_radio(struct genl_info *info, 
	enum nl80211_band band;

	const struct ieee80211_ops *ops = &mac80211_hwsim_ops;

	struct net *net;

	int idx;

	int idx, i;

	int n_limits = 0;



	if (WARN_ON(param->channels > 1 && !param->use_chanctx))
@@ -2768,12 +2768,23 @@ static int mac80211_hwsim_new_radio(struct genl_info *info, 
		goto failed_hw;

	}



	data->if_combination.max_interfaces = 0;

	for (i = 0; i < n_limits; i++)

		data->if_combination.max_interfaces +=

			data->if_limits[i].max;



	data->if_combination.n_limits = n_limits;

	data->if_combination.max_interfaces = 2048;

	data->if_combination.limits = data->if_limits;



	/*

	 * If we actually were asked to support combinations,

	 * advertise them - if there's only a single thing like

	 * only IBSS then don't advertise it as combinations.

	 */

	if (data->if_combination.max_interfaces > 1) {

		hw->wiphy->iface_combinations = &data->if_combination;

		hw->wiphy->n_iface_combinations = 1;

	}



	if (param->ciphers) {

		memcpy(data->ciphers, param->ciphers,

include/net/cfg80211.h

+5 −0
Original line number Diff line number Diff line
@@ -7183,6 +7183,11 @@ void cfg80211_pmsr_complete(struct wireless_dev *wdev, 
#define wiphy_info(wiphy, format, args...)			\

	dev_info(&(wiphy)->dev, format, ##args)



#define wiphy_err_ratelimited(wiphy, format, args...)		\

	dev_err_ratelimited(&(wiphy)->dev, format, ##args)

#define wiphy_warn_ratelimited(wiphy, format, args...)		\

	dev_warn_ratelimited(&(wiphy)->dev, format, ##args)



#define wiphy_debug(wiphy, format, args...)			\

	wiphy_printk(KERN_DEBUG, wiphy, format, ##args)