Commit 0225191a authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge tag 'wireless-2023-12-14' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless 

Johannes Berg says:

====================
 * add (and fix) certificate for regdb handover to Chen-Yu Tsai
 * fix rfkill GPIO handling
 * a few driver (iwlwifi, mt76) crash fixes
 * logic fixes in the stack

* tag 'wireless-2023-12-14' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless:
  wifi: cfg80211: fix certs build to not depend on file order
  wifi: mt76: fix crash with WED rx support enabled
  wifi: iwlwifi: pcie: avoid a NULL pointer dereference
  wifi: mac80211: mesh_plink: fix matches_local logic
  wifi: mac80211: mesh: check element parsing succeeded
  wifi: mac80211: check defragmentation succeeded
  wifi: mac80211: don't re-add debugfs during reconfig
  net: rfkill: gpio: set GPIO direction
  wifi: mac80211: check if the existing link config remains unchanged
  wifi: cfg80211: Add my certificate
  wifi: iwlwifi: pcie: add another missing bh-disable for rxq->lock
  wifi: ieee80211: don't require protected vendor action frames
====================

Link: https://lore.kernel.org/r/20231214111515.60626-3-johannes@sipsolutions.net


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents e9b797dc 3c2a8ebe

drivers/net/wireless/intel/iwlwifi/pcie/rx.c

+1 −1
Original line number Diff line number Diff line
@@ -1385,7 +1385,7 @@ static void iwl_pcie_rx_handle_rb(struct iwl_trans *trans, 
		 * if it is true then one of the handlers took the page.

		 */



		if (reclaim) {

		if (reclaim && txq) {

			u16 sequence = le16_to_cpu(pkt->hdr.sequence);

			int index = SEQ_TO_INDEX(sequence);

			int cmd_index = iwl_txq_get_cmd_index(txq, index);

drivers/net/wireless/intel/iwlwifi/pcie/trans.c

+2 −2
Original line number Diff line number Diff line
@@ -3106,7 +3106,7 @@ static u32 iwl_trans_pcie_dump_rbs(struct iwl_trans *trans, 
	struct iwl_rxq *rxq = &trans_pcie->rxq[0];

	u32 i, r, j, rb_len = 0;



	spin_lock(&rxq->lock);

	spin_lock_bh(&rxq->lock);



	r = iwl_get_closed_rb_stts(trans, rxq);
@@ -3130,7 +3130,7 @@ static u32 iwl_trans_pcie_dump_rbs(struct iwl_trans *trans, 
		*data = iwl_fw_error_next_data(*data);

	}



	spin_unlock(&rxq->lock);

	spin_unlock_bh(&rxq->lock);



	return rb_len;

}

drivers/net/wireless/mediatek/mt76/dma.c

+6 −4
Original line number Diff line number Diff line
@@ -783,7 +783,7 @@ mt76_dma_rx_reset(struct mt76_dev *dev, enum mt76_rxq_id qid) 


static void

mt76_add_fragment(struct mt76_dev *dev, struct mt76_queue *q, void *data,

		  int len, bool more, u32 info)

		  int len, bool more, u32 info, bool allow_direct)

{

	struct sk_buff *skb = q->rx_head;

	struct skb_shared_info *shinfo = skb_shinfo(skb);
@@ -795,7 +795,7 @@ mt76_add_fragment(struct mt76_dev *dev, struct mt76_queue *q, void *data, 


		skb_add_rx_frag(skb, nr_frags, page, offset, len, q->buf_size);

	} else {

		mt76_put_page_pool_buf(data, true);

		mt76_put_page_pool_buf(data, allow_direct);

	}



	if (more)
@@ -815,6 +815,7 @@ mt76_dma_rx_process(struct mt76_dev *dev, struct mt76_queue *q, int budget) 
	struct sk_buff *skb;

	unsigned char *data;

	bool check_ddone = false;

	bool allow_direct = !mt76_queue_is_wed_rx(q);

	bool more;



	if (IS_ENABLED(CONFIG_NET_MEDIATEK_SOC_WED) &&
@@ -855,7 +856,8 @@ mt76_dma_rx_process(struct mt76_dev *dev, struct mt76_queue *q, int budget) 
		}



		if (q->rx_head) {

			mt76_add_fragment(dev, q, data, len, more, info);

			mt76_add_fragment(dev, q, data, len, more, info,

					  allow_direct);

			continue;

		}
@@ -884,7 +886,7 @@ mt76_dma_rx_process(struct mt76_dev *dev, struct mt76_queue *q, int budget) 
		continue;



free_frag:

		mt76_put_page_pool_buf(data, true);

		mt76_put_page_pool_buf(data, allow_direct);

	}



	mt76_dma_rx_fill(dev, q, true);

include/linux/ieee80211.h

+2 −1
Original line number Diff line number Diff line
@@ -4447,7 +4447,8 @@ ieee80211_is_protected_dual_of_public_action(struct sk_buff *skb) 
		action != WLAN_PUB_ACTION_LOC_TRACK_NOTI &&

		action != WLAN_PUB_ACTION_FTM_REQUEST &&

		action != WLAN_PUB_ACTION_FTM_RESPONSE &&

		action != WLAN_PUB_ACTION_FILS_DISCOVERY;

		action != WLAN_PUB_ACTION_FILS_DISCOVERY &&

		action != WLAN_PUB_ACTION_VENDOR_SPECIFIC;

}



/**

net/mac80211/cfg.c

+2 −2
Original line number Diff line number Diff line
@@ -1788,10 +1788,10 @@ static int sta_link_apply_parameters(struct ieee80211_local *local, 
					  lockdep_is_held(&local->hw.wiphy->mtx));



	/*

	 * If there are no changes, then accept a link that doesn't exist,

	 * If there are no changes, then accept a link that exist,

	 * unless it's a new link.

	 */

	if (params->link_id < 0 && !new_link &&

	if (params->link_id >= 0 && !new_link &&

	    !params->link_mac && !params->txpwr_set &&

	    !params->supported_rates_len &&

	    !params->ht_capa && !params->vht_capa &&