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

Commit 93064ed5 authored by Alexei Avshalom Lazar's avatar Alexei Avshalom Lazar
Browse files

wil6210: update to proper EDMG channel 



On some cases there is wrong reference to the EDMG channel.
Update to proper EDMG channel.

Change-Id: Iada977daa5f0ae32790f1fe877db57e964d32434
Signed-off-by: default avatarAlexei Avshalom Lazar <ailizaro@codeaurora.org>
parent d38deb2d

drivers/net/wireless/ath/wil6210/cfg80211.c

+1 −1
Original line number Diff line number Diff line
@@ -1390,7 +1390,7 @@ static int wil_ft_connect(struct wiphy *wiphy, 
	if (test_bit(WMI_FW_CAPABILITY_CHANNEL_BONDING, wil->fw_capabilities))

		if (wil->force_edmg_channel) {

			rc = wil_spec2wmi_ch(wil->force_edmg_channel,

					     &auth_cmd.channel);

					     &auth_cmd.edmg_channel);

			if (rc)

				wil_err(wil, "FT: wmi channel for channel %d not found",

					wil->force_edmg_channel);

drivers/net/wireless/ath/wil6210/wmi.c

+12 −1
Original line number Diff line number Diff line
@@ -4056,6 +4056,7 @@ int wil_wmi_cfg_def_rx_offload(struct wil6210_priv *wil, 
	struct wireless_dev *wdev = ndev->ieee80211_ptr;

	struct wil6210_vif *vif = ndev_to_vif(ndev);

	int rc;

	u8 edmg_channel = 0;

	struct wmi_cfg_def_rx_offload_cmd cmd = {

		.max_msdu_size = cpu_to_le16(wil_mtu2macbuf(WIL_MAX_ETH_MTU)),

		.max_rx_pl_per_desc = cpu_to_le16(max_rx_pl_per_desc),
@@ -4079,7 +4080,17 @@ int wil_wmi_cfg_def_rx_offload(struct wil6210_priv *wil, 
			WMI_SNIFFER_EDMA_CP : WMI_SNIFFER_EDMA_BOTH;

		if (ch)

			cmd.sniffer_cfg.channel = ch->hw_value - 1;

		cmd.sniffer_cfg.edmg_channel = wil->force_edmg_channel;



		if (test_bit(WMI_FW_CAPABILITY_CHANNEL_BONDING,

			     wil->fw_capabilities))

			if (wil->force_edmg_channel) {

				rc = wil_spec2wmi_ch(wil->force_edmg_channel,

						     &edmg_channel);

				if (rc)

					wil_err(wil, "wmi channel for channel %d not found\n",

						wil->force_edmg_channel);

			}

		cmd.sniffer_cfg.edmg_channel = edmg_channel;

	}



	rc = wmi_call(wil, WMI_CFG_DEF_RX_OFFLOAD_CMDID, vif->mid, &cmd,