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

Merge tag 'mac80211-for-net-2020-02-14' of... 

Merge tag 'mac80211-for-net-2020-02-14' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211



Johannes Berg says:

====================
Just a few fixes:
 * avoid running out of tracking space for frames that need
   to be reported to userspace by using more bits
 * fix beacon handling suppression by adding some relevant
   elements to the CRC calculation
 * fix quiet mode in action frames
 * fix crash in ethtool for virt_wifi and similar
 * add a missing policy entry
 * fix 160 & 80+80 bandwidth to take local capabilities into
   account
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 907e51e4 33181ea7

include/net/mac80211.h

+5 −6
Original line number Diff line number Diff line
@@ -1004,12 +1004,11 @@ ieee80211_rate_get_vht_nss(const struct ieee80211_tx_rate *rate) 
struct ieee80211_tx_info {

	/* common information */

	u32 flags;

	u8 band;



	u8 hw_queue;



	u16 ack_frame_id:6;

	u16 tx_time_est:10;

	u32 band:3,

	    ack_frame_id:13,

	    hw_queue:4,

	    tx_time_est:10;

	/* 2 free bits */



	union {

		struct {

net/mac80211/cfg.c

+1 −1
Original line number Diff line number Diff line
@@ -3450,7 +3450,7 @@ int ieee80211_attach_ack_skb(struct ieee80211_local *local, struct sk_buff *skb, 


	spin_lock_irqsave(&local->ack_status_lock, spin_flags);

	id = idr_alloc(&local->ack_status_frames, ack_skb,

		       1, 0x40, GFP_ATOMIC);

		       1, 0x2000, GFP_ATOMIC);

	spin_unlock_irqrestore(&local->ack_status_lock, spin_flags);



	if (id < 0) {

net/mac80211/mlme.c

+4 −4
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
 * Copyright 2007, Michael Wu <flamingice@sourmilk.net>

 * Copyright 2013-2014  Intel Mobile Communications GmbH

 * Copyright (C) 2015 - 2017 Intel Deutschland GmbH

 * Copyright (C) 2018 - 2019 Intel Corporation

 * Copyright (C) 2018 - 2020 Intel Corporation

 */



#include <linux/delay.h>
@@ -1311,7 +1311,7 @@ ieee80211_sta_process_chanswitch(struct ieee80211_sub_if_data *sdata, 
	if (!res) {

		ch_switch.timestamp = timestamp;

		ch_switch.device_timestamp = device_timestamp;

		ch_switch.block_tx =  beacon ? csa_ie.mode : 0;

		ch_switch.block_tx = csa_ie.mode;

		ch_switch.chandef = csa_ie.chandef;

		ch_switch.count = csa_ie.count;

		ch_switch.delay = csa_ie.max_switch_time;
@@ -1404,7 +1404,7 @@ ieee80211_sta_process_chanswitch(struct ieee80211_sub_if_data *sdata, 


	sdata->vif.csa_active = true;

	sdata->csa_chandef = csa_ie.chandef;

	sdata->csa_block_tx = ch_switch.block_tx;

	sdata->csa_block_tx = csa_ie.mode;

	ifmgd->csa_ignored_same_chan = false;



	if (sdata->csa_block_tx)
@@ -1438,7 +1438,7 @@ ieee80211_sta_process_chanswitch(struct ieee80211_sub_if_data *sdata, 
	 * reset when the disconnection worker runs.

	 */

	sdata->vif.csa_active = true;

	sdata->csa_block_tx = ch_switch.block_tx;

	sdata->csa_block_tx = csa_ie.mode;



	ieee80211_queue_work(&local->hw, &ifmgd->csa_connection_drop_work);

	mutex_unlock(&local->chanctx_mtx);

net/mac80211/tx.c

+1 −1
Original line number Diff line number Diff line
@@ -2442,7 +2442,7 @@ static int ieee80211_store_ack_skb(struct ieee80211_local *local, 


		spin_lock_irqsave(&local->ack_status_lock, flags);

		id = idr_alloc(&local->ack_status_frames, ack_skb,

			       1, 0x40, GFP_ATOMIC);

			       1, 0x2000, GFP_ATOMIC);

		spin_unlock_irqrestore(&local->ack_status_lock, flags);



		if (id >= 0) {

net/mac80211/util.c

+26 −8
Original line number Diff line number Diff line
@@ -1063,15 +1063,21 @@ _ieee802_11_parse_elems_crc(const u8 *start, size_t len, bool action, 
				elem_parse_failed = true;

			break;

		case WLAN_EID_VHT_OPERATION:

			if (elen >= sizeof(struct ieee80211_vht_operation))

			if (elen >= sizeof(struct ieee80211_vht_operation)) {

				elems->vht_operation = (void *)pos;

			else

				if (calc_crc)

					crc = crc32_be(crc, pos - 2, elen + 2);

				break;

			}

			elem_parse_failed = true;

			break;

		case WLAN_EID_OPMODE_NOTIF:

			if (elen > 0)

			if (elen > 0) {

				elems->opmode_notif = pos;

			else

				if (calc_crc)

					crc = crc32_be(crc, pos - 2, elen + 2);

				break;

			}

			elem_parse_failed = true;

			break;

		case WLAN_EID_MESH_ID:
@@ -2987,10 +2993,22 @@ bool ieee80211_chandef_vht_oper(struct ieee80211_hw *hw, 
	int cf0, cf1;

	int ccfs0, ccfs1, ccfs2;

	int ccf0, ccf1;

	u32 vht_cap;

	bool support_80_80 = false;

	bool support_160 = false;



	if (!oper || !htop)

		return false;



	vht_cap = hw->wiphy->bands[chandef->chan->band]->vht_cap.cap;

	support_160 = (vht_cap & (IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_MASK |

				  IEEE80211_VHT_CAP_EXT_NSS_BW_MASK));

	support_80_80 = ((vht_cap &

			 IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160_80PLUS80MHZ) ||

			(vht_cap & IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160MHZ &&

			 vht_cap & IEEE80211_VHT_CAP_EXT_NSS_BW_MASK) ||

			((vht_cap & IEEE80211_VHT_CAP_EXT_NSS_BW_MASK) >>

				    IEEE80211_VHT_CAP_EXT_NSS_BW_SHIFT > 1));

	ccfs0 = oper->center_freq_seg0_idx;

	ccfs1 = oper->center_freq_seg1_idx;

	ccfs2 = (le16_to_cpu(htop->operation_mode) &
@@ -3018,10 +3036,10 @@ bool ieee80211_chandef_vht_oper(struct ieee80211_hw *hw, 
			unsigned int diff;



			diff = abs(ccf1 - ccf0);

			if (diff == 8) {

			if ((diff == 8) && support_160) {

				new.width = NL80211_CHAN_WIDTH_160;

				new.center_freq1 = cf1;

			} else if (diff > 8) {

			} else if ((diff > 8) && support_80_80) {

				new.width = NL80211_CHAN_WIDTH_80P80;

				new.center_freq2 = cf1;

			}

CRA Git | Maintained and supported by SUSTech CRA and CCSE