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

Commit 97bce57b authored by Luca Coelho's avatar Luca Coelho
Browse files

iwlwifi: mvm: use IWL_HCMD_NOCOPY for MCAST_FILTER_CMD 

The MCAST_FILTER_CMD can get quite large when we have many mcast
addresses to set (we support up to 255).  So the command should be
send as NOCOPY to prevent a warning caused by too-long commands:

WARNING: CPU: 0 PID: 9700 at /root/iwlwifi/stack-dev/drivers/net/wireless/intel/iwlwifi/pcie/tx.c:1550 iwl_pcie_enqueue_hcmd+0x8c7/0xb40 [iwlwifi]
Command MCAST_FILTER_CMD (0x1d0) is too large (328 bytes)

This fixes: https://bugzilla.kernel.org/show_bug.cgi?id=196743



Cc: stable@vger.kernel.org
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent 8458e48a

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

+9 −1
Original line number Diff line number Diff line
@@ -1546,6 +1546,11 @@ static void iwl_mvm_mc_iface_iterator(void *_data, u8 *mac, 
	struct iwl_mvm_mc_iter_data *data = _data;

	struct iwl_mvm *mvm = data->mvm;

	struct iwl_mcast_filter_cmd *cmd = mvm->mcast_filter_cmd;

	struct iwl_host_cmd hcmd = {

		.id = MCAST_FILTER_CMD,

		.flags = CMD_ASYNC,

		.dataflags[0] = IWL_HCMD_DFL_NOCOPY,

	};

	int ret, len;



	/* if we don't have free ports, mcast frames will be dropped */
@@ -1560,7 +1565,10 @@ static void iwl_mvm_mc_iface_iterator(void *_data, u8 *mac, 
	memcpy(cmd->bssid, vif->bss_conf.bssid, ETH_ALEN);

	len = roundup(sizeof(*cmd) + cmd->count * ETH_ALEN, 4);



	ret = iwl_mvm_send_cmd_pdu(mvm, MCAST_FILTER_CMD, CMD_ASYNC, len, cmd);

	hcmd.len[0] = len;

	hcmd.data[0] = cmd;



	ret = iwl_mvm_send_cmd(mvm, &hcmd);

	if (ret)

		IWL_ERR(mvm, "mcast filter cmd error. ret=%d\n", ret);

}