Commit cd882e2f authored by Johannes Berg's avatar Johannes Berg
Browse files

Merge wireless into wireless-next 



There's a conflict already and some upcoming changes
also depend on changes in wireless for being conflict-
free, so pull wireless in to make all that easier.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parents 18209441 b7198383

drivers/net/wireless/intel/iwlwifi/fw/acpi.c

+9 −6
Original line number Diff line number Diff line
@@ -475,7 +475,7 @@ int iwl_acpi_get_wrds_table(struct iwl_fw_runtime *fwrt) 
					 &tbl_rev);

	if (!IS_ERR(wifi_pkg)) {

		if (tbl_rev != 2) {

			ret = PTR_ERR(wifi_pkg);

			ret = -EINVAL;

			goto out_free;

		}
@@ -491,7 +491,7 @@ int iwl_acpi_get_wrds_table(struct iwl_fw_runtime *fwrt) 
					 &tbl_rev);

	if (!IS_ERR(wifi_pkg)) {

		if (tbl_rev != 1) {

			ret = PTR_ERR(wifi_pkg);

			ret = -EINVAL;

			goto out_free;

		}
@@ -507,7 +507,7 @@ int iwl_acpi_get_wrds_table(struct iwl_fw_runtime *fwrt) 
					 &tbl_rev);

	if (!IS_ERR(wifi_pkg)) {

		if (tbl_rev != 0) {

			ret = PTR_ERR(wifi_pkg);

			ret = -EINVAL;

			goto out_free;

		}
@@ -563,7 +563,7 @@ int iwl_acpi_get_ewrd_table(struct iwl_fw_runtime *fwrt) 
					 &tbl_rev);

	if (!IS_ERR(wifi_pkg)) {

		if (tbl_rev != 2) {

			ret = PTR_ERR(wifi_pkg);

			ret = -EINVAL;

			goto out_free;

		}
@@ -579,7 +579,7 @@ int iwl_acpi_get_ewrd_table(struct iwl_fw_runtime *fwrt) 
					 &tbl_rev);

	if (!IS_ERR(wifi_pkg)) {

		if (tbl_rev != 1) {

			ret = PTR_ERR(wifi_pkg);

			ret = -EINVAL;

			goto out_free;

		}
@@ -595,7 +595,7 @@ int iwl_acpi_get_ewrd_table(struct iwl_fw_runtime *fwrt) 
					 &tbl_rev);

	if (!IS_ERR(wifi_pkg)) {

		if (tbl_rev != 0) {

			ret = PTR_ERR(wifi_pkg);

			ret = -EINVAL;

			goto out_free;

		}
@@ -848,6 +848,9 @@ int iwl_acpi_get_ppag_table(struct iwl_fw_runtime *fwrt) 
		goto read_table;

	}



	ret = PTR_ERR(wifi_pkg);

	goto out_free;



read_table:

	fwrt->ppag_ver = tbl_rev;

	flags = &wifi_pkg->package.elements[1];

drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c

+3 −0
Original line number Diff line number Diff line
@@ -3698,6 +3698,9 @@ iwl_mvm_sta_state_notexist_to_none(struct iwl_mvm *mvm, 
					   NL80211_TDLS_SETUP);

	}



	if (ret)

		return ret;



	for_each_sta_active_link(vif, sta, link_sta, i)

		link_sta->agg.max_rc_amsdu_len = 1;

drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c

+4 −0
Original line number Diff line number Diff line
@@ -512,6 +512,10 @@ static bool iwl_mvm_is_dup(struct ieee80211_sta *sta, int queue, 
		return false;



	mvm_sta = iwl_mvm_sta_from_mac80211(sta);



	if (WARN_ON_ONCE(!mvm_sta->dup_data))

		return false;



	dup_data = &mvm_sta->dup_data[queue];



	/*

drivers/net/wireless/intel/iwlwifi/mvm/time-event.c

+2 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause

/*

 * Copyright (C) 2012-2014, 2018-2023 Intel Corporation

 * Copyright (C) 2012-2014, 2018-2024 Intel Corporation

 * Copyright (C) 2013-2015 Intel Mobile Communications GmbH

 * Copyright (C) 2017 Intel Deutschland GmbH

 */
@@ -971,6 +971,7 @@ void iwl_mvm_rx_session_protect_notif(struct iwl_mvm *mvm, 
	if (!le32_to_cpu(notif->status) || !le32_to_cpu(notif->start)) {

		/* End TE, notify mac80211 */

		mvmvif->time_event_data.id = SESSION_PROTECT_CONF_MAX_ID;

		mvmvif->time_event_data.link_id = -1;

		iwl_mvm_p2p_roc_finished(mvm);

		ieee80211_remain_on_channel_expired(mvm->hw);

	} else if (le32_to_cpu(notif->start)) {

drivers/net/wireless/intel/iwlwifi/mvm/tx.c

+59 −10
Original line number Diff line number Diff line
@@ -545,13 +545,24 @@ static bool iwl_mvm_use_host_rate(struct iwl_mvm *mvm, 
	return mvm->trans->trans_cfg->device_family < IWL_DEVICE_FAMILY_BZ;

}



static void iwl_mvm_copy_hdr(void *cmd, const void *hdr, int hdrlen,

			     const u8 *addr3_override)

{

	struct ieee80211_hdr *out_hdr = cmd;



	memcpy(cmd, hdr, hdrlen);

	if (addr3_override)

		memcpy(out_hdr->addr3, addr3_override, ETH_ALEN);

}



/*

 * Allocates and sets the Tx cmd the driver data pointers in the skb

 */

static struct iwl_device_tx_cmd *

iwl_mvm_set_tx_params(struct iwl_mvm *mvm, struct sk_buff *skb,

		      struct ieee80211_tx_info *info, int hdrlen,

		      struct ieee80211_sta *sta, u8 sta_id)

		      struct ieee80211_sta *sta, u8 sta_id,

		      const u8 *addr3_override)

{

	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;

	struct iwl_device_tx_cmd *dev_cmd;
@@ -609,7 +620,7 @@ iwl_mvm_set_tx_params(struct iwl_mvm *mvm, struct sk_buff *skb, 
			cmd->len = cpu_to_le16((u16)skb->len);



			/* Copy MAC header from skb into command buffer */

			memcpy(cmd->hdr, hdr, hdrlen);

			iwl_mvm_copy_hdr(cmd->hdr, hdr, hdrlen, addr3_override);



			cmd->flags = cpu_to_le16(flags);

			cmd->rate_n_flags = cpu_to_le32(rate_n_flags);
@@ -624,7 +635,7 @@ iwl_mvm_set_tx_params(struct iwl_mvm *mvm, struct sk_buff *skb, 
			cmd->len = cpu_to_le16((u16)skb->len);



			/* Copy MAC header from skb into command buffer */

			memcpy(cmd->hdr, hdr, hdrlen);

			iwl_mvm_copy_hdr(cmd->hdr, hdr, hdrlen, addr3_override);



			cmd->flags = cpu_to_le32(flags);

			cmd->rate_n_flags = cpu_to_le32(rate_n_flags);
@@ -642,7 +653,7 @@ iwl_mvm_set_tx_params(struct iwl_mvm *mvm, struct sk_buff *skb, 
	iwl_mvm_set_tx_cmd_rate(mvm, tx_cmd, info, sta, hdr->frame_control);



	/* Copy MAC header from skb into command buffer */

	memcpy(tx_cmd->hdr, hdr, hdrlen);

	iwl_mvm_copy_hdr(tx_cmd->hdr, hdr, hdrlen, addr3_override);



out:

	return dev_cmd;
@@ -845,7 +856,8 @@ int iwl_mvm_tx_skb_non_sta(struct iwl_mvm *mvm, struct sk_buff *skb) 


	IWL_DEBUG_TX(mvm, "station Id %d, queue=%d\n", sta_id, queue);



	dev_cmd = iwl_mvm_set_tx_params(mvm, skb, &info, hdrlen, NULL, sta_id);

	dev_cmd = iwl_mvm_set_tx_params(mvm, skb, &info, hdrlen, NULL, sta_id,

					NULL);

	if (!dev_cmd)

		return -1;
@@ -1171,7 +1183,8 @@ static int iwl_mvm_tx_pkt_queued(struct iwl_mvm *mvm, 
 */

static int iwl_mvm_tx_mpdu(struct iwl_mvm *mvm, struct sk_buff *skb,

			   struct ieee80211_tx_info *info,

			   struct ieee80211_sta *sta)

			   struct ieee80211_sta *sta,

			   const u8 *addr3_override)

{

	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;

	struct iwl_mvm_sta *mvmsta;
@@ -1203,7 +1216,8 @@ static int iwl_mvm_tx_mpdu(struct iwl_mvm *mvm, struct sk_buff *skb, 
		iwl_mvm_probe_resp_set_noa(mvm, skb);



	dev_cmd = iwl_mvm_set_tx_params(mvm, skb, info, hdrlen,

					sta, mvmsta->deflink.sta_id);

					sta, mvmsta->deflink.sta_id,

					addr3_override);

	if (!dev_cmd)

		goto drop;
@@ -1325,9 +1339,11 @@ int iwl_mvm_tx_skb_sta(struct iwl_mvm *mvm, struct sk_buff *skb, 
	struct iwl_mvm_sta *mvmsta = iwl_mvm_sta_from_mac80211(sta);

	struct ieee80211_tx_info info;

	struct sk_buff_head mpdus_skbs;

	struct ieee80211_vif *vif;

	unsigned int payload_len;

	int ret;

	struct sk_buff *orig_skb = skb;

	const u8 *addr3;



	if (WARN_ON_ONCE(!mvmsta))

		return -1;
@@ -1338,26 +1354,59 @@ int iwl_mvm_tx_skb_sta(struct iwl_mvm *mvm, struct sk_buff *skb, 
	memcpy(&info, skb->cb, sizeof(info));



	if (!skb_is_gso(skb))

		return iwl_mvm_tx_mpdu(mvm, skb, &info, sta);

		return iwl_mvm_tx_mpdu(mvm, skb, &info, sta, NULL);



	payload_len = skb_tail_pointer(skb) - skb_transport_header(skb) -

		tcp_hdrlen(skb) + skb->data_len;



	if (payload_len <= skb_shinfo(skb)->gso_size)

		return iwl_mvm_tx_mpdu(mvm, skb, &info, sta);

		return iwl_mvm_tx_mpdu(mvm, skb, &info, sta, NULL);



	__skb_queue_head_init(&mpdus_skbs);



	vif = info.control.vif;

	if (!vif)

		return -1;



	ret = iwl_mvm_tx_tso(mvm, skb, &info, sta, &mpdus_skbs);

	if (ret)

		return ret;



	WARN_ON(skb_queue_empty(&mpdus_skbs));



	/*

	 * As described in IEEE sta 802.11-2020, table 9-30 (Address

	 * field contents), A-MSDU address 3 should contain the BSSID

	 * address.

	 * Pass address 3 down to iwl_mvm_tx_mpdu() and further to set it

	 * in the command header. We need to preserve the original

	 * address 3 in the skb header to correctly create all the

	 * A-MSDU subframe headers from it.

	 */

	switch (vif->type) {

	case NL80211_IFTYPE_STATION:

		addr3 = vif->cfg.ap_addr;

		break;

	case NL80211_IFTYPE_AP:

		addr3 = vif->addr;

		break;

	default:

		addr3 = NULL;

		break;

	}



	while (!skb_queue_empty(&mpdus_skbs)) {

		struct ieee80211_hdr *hdr;

		bool amsdu;



		skb = __skb_dequeue(&mpdus_skbs);

		hdr = (void *)skb->data;

		amsdu = ieee80211_is_data_qos(hdr->frame_control) &&

			(*ieee80211_get_qos_ctl(hdr) &

			 IEEE80211_QOS_CTL_A_MSDU_PRESENT);



		ret = iwl_mvm_tx_mpdu(mvm, skb, &info, sta);

		ret = iwl_mvm_tx_mpdu(mvm, skb, &info, sta,

				      amsdu ? addr3 : NULL);

		if (ret) {

			/* Free skbs created as part of TSO logic that have not yet been dequeued */

			__skb_queue_purge(&mpdus_skbs);