Commit bde2c0af authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge tag 'mac80211-for-net-2021-01-18.2' of... 

Merge tag 'mac80211-for-net-2021-01-18.2' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211

Johannes Berg says:

====================
Various fixes:
 * kernel-doc parsing fixes
 * incorrect debugfs string checks
 * locking fix in regulatory
 * some encryption-related fixes

* tag 'mac80211-for-net-2021-01-18.2' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211:
  mac80211: check if atf has been disabled in __ieee80211_schedule_txq
  mac80211: do not drop tx nulldata packets on encrypted links
  mac80211: fix encryption key selection for 802.3 xmit
  mac80211: fix fast-rx encryption check
  mac80211: fix incorrect strlen of .write in debugfs
  cfg80211: fix a kerneldoc markup
  cfg80211: Save the regulatory domain with a lock
  cfg80211/mac80211: fix kernel-doc for SAR APIs
====================

Link: https://lore.kernel.org/r/20210118204750.7243-1-johannes@sipsolutions.net


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 87fe0436 c13cf5c1

include/net/cfg80211.h

+4 −1
Original line number Diff line number Diff line
@@ -1756,7 +1756,7 @@ struct cfg80211_sar_specs { 




/**

 * @struct cfg80211_sar_chan_ranges - sar frequency ranges

 * struct cfg80211_sar_freq_ranges - sar frequency ranges

 * @start_freq:  start range edge frequency

 * @end_freq:    end range edge frequency

 */
@@ -3972,6 +3972,8 @@ struct mgmt_frame_regs { 
 *	This callback may sleep.

 * @reset_tid_config: Reset TID specific configuration for the peer, for the

 *	given TIDs. This callback may sleep.

 *

 * @set_sar_specs: Update the SAR (TX power) settings.

 */

struct cfg80211_ops {

	int	(*suspend)(struct wiphy *wiphy, struct cfg80211_wowlan *wow);
@@ -4929,6 +4931,7 @@ struct wiphy_iftype_akm_suites { 
 * @max_data_retry_count: maximum supported per TID retry count for

 *	configuration through the %NL80211_TID_CONFIG_ATTR_RETRY_SHORT and

 *	%NL80211_TID_CONFIG_ATTR_RETRY_LONG attributes

 * @sar_capa: SAR control capabilities

 */

struct wiphy {

	/* assign these fields before you register the wiphy */

include/net/mac80211.h

+1 −0
Original line number Diff line number Diff line
@@ -3880,6 +3880,7 @@ enum ieee80211_reconfig_type { 
 *	This callback may sleep.

 * @sta_set_4addr: Called to notify the driver when a station starts/stops using

 *	4-address mode

 * @set_sar_specs: Update the SAR (TX power) settings.

 */

struct ieee80211_ops {

	void (*tx)(struct ieee80211_hw *hw,

net/mac80211/debugfs.c

+20 −24
Original line number Diff line number Diff line
@@ -120,18 +120,17 @@ static ssize_t aqm_write(struct file *file, 
{

	struct ieee80211_local *local = file->private_data;

	char buf[100];

	size_t len;



	if (count > sizeof(buf))

	if (count >= sizeof(buf))

		return -EINVAL;



	if (copy_from_user(buf, user_buf, count))

		return -EFAULT;



	buf[sizeof(buf) - 1] = '\0';

	len = strlen(buf);

	if (len > 0 && buf[len-1] == '\n')

		buf[len-1] = 0;

	if (count && buf[count - 1] == '\n')

		buf[count - 1] = '\0';

	else

		buf[count] = '\0';



	if (sscanf(buf, "fq_limit %u", &local->fq.limit) == 1)

		return count;
@@ -177,18 +176,17 @@ static ssize_t airtime_flags_write(struct file *file, 
{

	struct ieee80211_local *local = file->private_data;

	char buf[16];

	size_t len;



	if (count > sizeof(buf))

	if (count >= sizeof(buf))

		return -EINVAL;



	if (copy_from_user(buf, user_buf, count))

		return -EFAULT;



	buf[sizeof(buf) - 1] = 0;

	len = strlen(buf);

	if (len > 0 && buf[len - 1] == '\n')

		buf[len - 1] = 0;

	if (count && buf[count - 1] == '\n')

		buf[count - 1] = '\0';

	else

		buf[count] = '\0';



	if (kstrtou16(buf, 0, &local->airtime_flags))

		return -EINVAL;
@@ -237,20 +235,19 @@ static ssize_t aql_txq_limit_write(struct file *file, 
{

	struct ieee80211_local *local = file->private_data;

	char buf[100];

	size_t len;

	u32 ac, q_limit_low, q_limit_high, q_limit_low_old, q_limit_high_old;

	struct sta_info *sta;



	if (count > sizeof(buf))

	if (count >= sizeof(buf))

		return -EINVAL;



	if (copy_from_user(buf, user_buf, count))

		return -EFAULT;



	buf[sizeof(buf) - 1] = 0;

	len = strlen(buf);

	if (len > 0 && buf[len - 1] == '\n')

		buf[len - 1] = 0;

	if (count && buf[count - 1] == '\n')

		buf[count - 1] = '\0';

	else

		buf[count] = '\0';



	if (sscanf(buf, "%u %u %u", &ac, &q_limit_low, &q_limit_high) != 3)

		return -EINVAL;
@@ -306,18 +303,17 @@ static ssize_t force_tx_status_write(struct file *file, 
{

	struct ieee80211_local *local = file->private_data;

	char buf[3];

	size_t len;



	if (count > sizeof(buf))

	if (count >= sizeof(buf))

		return -EINVAL;



	if (copy_from_user(buf, user_buf, count))

		return -EFAULT;



	buf[sizeof(buf) - 1] = '\0';

	len = strlen(buf);

	if (len > 0 && buf[len - 1] == '\n')

		buf[len - 1] = 0;

	if (count && buf[count - 1] == '\n')

		buf[count - 1] = '\0';

	else

		buf[count] = '\0';



	if (buf[0] == '0' && buf[1] == '\0')

		local->force_tx_status = 0;

net/mac80211/rx.c

+2 −0
Original line number Diff line number Diff line
@@ -4176,6 +4176,8 @@ void ieee80211_check_fast_rx(struct sta_info *sta) 


	rcu_read_lock();

	key = rcu_dereference(sta->ptk[sta->ptk_idx]);

	if (!key)

		key = rcu_dereference(sdata->default_unicast_key);

	if (key) {

		switch (key->conf.cipher) {

		case WLAN_CIPHER_SUITE_TKIP:

net/mac80211/tx.c

+17 −14
Original line number Diff line number Diff line
@@ -649,7 +649,7 @@ ieee80211_tx_h_select_key(struct ieee80211_tx_data *tx) 
		if (!skip_hw && tx->key &&

		    tx->key->flags & KEY_FLAG_UPLOADED_TO_HARDWARE)

			info->control.hw_key = &tx->key->conf;

	} else if (!ieee80211_is_mgmt(hdr->frame_control) && tx->sta &&

	} else if (ieee80211_is_data_present(hdr->frame_control) && tx->sta &&

		   test_sta_flag(tx->sta, WLAN_STA_USES_ENCRYPTION)) {

		return TX_DROP;

	}
@@ -3809,7 +3809,7 @@ void __ieee80211_schedule_txq(struct ieee80211_hw *hw, 
		 * get immediately moved to the back of the list on the next

		 * call to ieee80211_next_txq().

		 */

		if (txqi->txq.sta &&

		if (txqi->txq.sta && local->airtime_flags &&

		    wiphy_ext_feature_isset(local->hw.wiphy,

					    NL80211_EXT_FEATURE_AIRTIME_FAIRNESS))

			list_add(&txqi->schedule_order,
@@ -4251,7 +4251,6 @@ netdev_tx_t ieee80211_subif_start_xmit_8023(struct sk_buff *skb, 
	struct ethhdr *ehdr = (struct ethhdr *)skb->data;

	struct ieee80211_key *key;

	struct sta_info *sta;

	bool offload = true;



	if (unlikely(skb->len < ETH_HLEN)) {

		kfree_skb(skb);
@@ -4268,17 +4267,21 @@ netdev_tx_t ieee80211_subif_start_xmit_8023(struct sk_buff *skb, 
	if (unlikely(IS_ERR_OR_NULL(sta) || !sta->uploaded ||

	    !test_sta_flag(sta, WLAN_STA_AUTHORIZED) ||

	    sdata->control_port_protocol == ehdr->h_proto))

		offload = false;

	else if ((key = rcu_dereference(sta->ptk[sta->ptk_idx])) &&

		 (!(key->flags & KEY_FLAG_UPLOADED_TO_HARDWARE) ||

		goto skip_offload;



	key = rcu_dereference(sta->ptk[sta->ptk_idx]);

	if (!key)

		key = rcu_dereference(sdata->default_unicast_key);



	if (key && (!(key->flags & KEY_FLAG_UPLOADED_TO_HARDWARE) ||

		    key->conf.cipher == WLAN_CIPHER_SUITE_TKIP))

		offload = false;

		goto skip_offload;



	if (offload)

	ieee80211_8023_xmit(sdata, dev, sta, key, skb);

	else

		ieee80211_subif_start_xmit(skb, dev);

	goto out;



skip_offload:

	ieee80211_subif_start_xmit(skb, dev);

out:

	rcu_read_unlock();