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

Commit 97397633 authored by Igor Mitsyanko's avatar Igor Mitsyanko Committed by Kalle Valo
Browse files

qtnfmac: do not cache CSA chandef info 



It is never used for anything useful, and all logic is handled by
either WiFi card or higher layers.

Signed-off-by: default avatarIgor Mitsyanko <igor.mitsyanko.os@quantenna.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 8c015b90

drivers/net/wireless/quantenna/qtnfmac/cfg80211.c

+0 −12
Original line number Diff line number Diff line
@@ -809,7 +809,6 @@ qtnf_get_channel(struct wiphy *wiphy, struct wireless_dev *wdev, 
static int qtnf_channel_switch(struct wiphy *wiphy, struct net_device *dev,

			       struct cfg80211_csa_settings *params)

{

	struct qtnf_wmac *mac = wiphy_priv(wiphy);

	struct qtnf_vif *vif = qtnf_netdev_get_priv(dev);

	int ret;
@@ -830,17 +829,6 @@ static int qtnf_channel_switch(struct wiphy *wiphy, struct net_device *dev, 
		return -EOPNOTSUPP;

	}



	if (vif->vifid != 0) {

		if (!(mac->status & QTNF_MAC_CSA_ACTIVE))

			return -EOPNOTSUPP;



		if (!cfg80211_chandef_identical(&params->chandef,

						&mac->csa_chandef))

			return -EINVAL;



		return 0;

	}



	if (!cfg80211_chandef_valid(&params->chandef)) {

		pr_err("%s: invalid channel\n", dev->name);

		return -EINVAL;

drivers/net/wireless/quantenna/qtnfmac/commands.c

+0 −2
Original line number Diff line number Diff line
@@ -2337,8 +2337,6 @@ int qtnf_cmd_send_chan_switch(struct qtnf_vif *vif, 


	switch (res_code) {

	case QLINK_CMD_RESULT_OK:

		memcpy(&mac->csa_chandef, &params->chandef,

		       sizeof(mac->csa_chandef));

		mac->status |= QTNF_MAC_CSA_ACTIVE;

		ret = 0;

		break;

drivers/net/wireless/quantenna/qtnfmac/core.h

+0 −1
Original line number Diff line number Diff line
@@ -147,7 +147,6 @@ struct qtnf_wmac { 
	struct qtnf_vif iflist[QTNF_MAX_INTF];

	struct cfg80211_scan_request *scan_req;

	struct cfg80211_chan_def chandef;

	struct cfg80211_chan_def csa_chandef;

	struct mutex mac_lock;	/* lock during wmac speicific ops */

	struct timer_list scan_timeout;

};

drivers/net/wireless/quantenna/qtnfmac/event.c

+1 −7
Original line number Diff line number Diff line
@@ -381,13 +381,7 @@ qtnf_event_handle_freq_change(struct qtnf_wmac *mac, 
		 mac->macid, chandef.chan->hw_value, chandef.center_freq1,

		 chandef.center_freq2, chandef.width);



	if (mac->status & QTNF_MAC_CSA_ACTIVE) {

	mac->status &= ~QTNF_MAC_CSA_ACTIVE;

		if (chandef.chan->hw_value != mac->csa_chandef.chan->hw_value)

			pr_warn("unexpected switch to %u during CSA to %u\n",

				chandef.chan->hw_value,

				mac->csa_chandef.chan->hw_value);

	}



	memcpy(&mac->chandef, &chandef, sizeof(mac->chandef));