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: Igor Mitsyanko <igor.mitsyanko.os@quantenna.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/quantenna/qtnfmac/cfg80211.c b/drivers/net/wireless/quantenna/qtnfmac/cfg80211.c
index 30f8be5544065380dfd76c4938cf14c2937864fc..262e8cfd8f8dc23967087f45236e2f80ae496672 100644 (file)
--- a/drivers/net/wireless/quantenna/qtnfmac/cfg80211.c
+++ b/drivers/net/wireless/quantenna/qtnfmac/cfg80211.c
@@ -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;

diff --git a/drivers/net/wireless/quantenna/qtnfmac/commands.c b/drivers/net/wireless/quantenna/qtnfmac/commands.c
index 0138dadf93b11f5caafaaec250355a70eddcd5ac..42f7e1dadd2904522d03fcbc2e5ac4365ec20e4a 100644 (file)
--- a/drivers/net/wireless/quantenna/qtnfmac/commands.c
+++ b/drivers/net/wireless/quantenna/qtnfmac/commands.c
@@ -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;

diff --git a/drivers/net/wireless/quantenna/qtnfmac/core.h b/drivers/net/wireless/quantenna/qtnfmac/core.h
index 066fcd1095a0b6d2a41fb21b1898a055964a0657..521ce094f2a697df9a2029879cf4988c697de205 100644 (file)
--- a/drivers/net/wireless/quantenna/qtnfmac/core.h
+++ b/drivers/net/wireless/quantenna/qtnfmac/core.h
@@ -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;
 };

diff --git a/drivers/net/wireless/quantenna/qtnfmac/event.c b/drivers/net/wireless/quantenna/qtnfmac/event.c
index df58e83fbbb8a94e72fc8a0ac74999c56321ee0c..77563b0b1a7a4af7fee0f620c8375edb0d8aa2c4 100644 (file)
--- a/drivers/net/wireless/quantenna/qtnfmac/event.c
+++ b/drivers/net/wireless/quantenna/qtnfmac/event.c
@@ -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);
-       }
+       mac->status &= ~QTNF_MAC_CSA_ACTIVE;
 
        memcpy(&mac->chandef, &chandef, sizeof(mac->chandef));