wil6210: remove reference to preset_chandef

The field preset_chandef of wireless_dev must not be accessed
by the driver because it is private to cfg80211. Store the
monitor channel locally in wil6210_priv instead.

Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
Signed-off-by: Maya Erez <qca_merez@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/ath/wil6210/cfg80211.c b/drivers/net/wireless/ath/wil6210/cfg80211.c
index 39509d053eea0c1977c9d711cfeff6639df630eb..768f63f38341251c5a47bc09dc5ddb292efb0552 100644 (file)
--- a/drivers/net/wireless/ath/wil6210/cfg80211.c
+++ b/drivers/net/wireless/ath/wil6210/cfg80211.c
@@ -956,9 +956,8 @@ static int wil_cfg80211_set_channel(struct wiphy *wiphy,
                                    struct cfg80211_chan_def *chandef)
 {
        struct wil6210_priv *wil = wiphy_to_wil(wiphy);
-       struct wireless_dev *wdev = wil_to_wdev(wil);
 
-       wdev->preset_chandef = *chandef;
+       wil->monitor_chandef = *chandef;
 
        return 0;
 }

diff --git a/drivers/net/wireless/ath/wil6210/debugfs.c b/drivers/net/wireless/ath/wil6210/debugfs.c
index 4475937faf250c572ea043564a4bdd65a02837ec..4a4888246e8c6df2e5d660c98170f0b5d98363c8 100644 (file)
--- a/drivers/net/wireless/ath/wil6210/debugfs.c
+++ b/drivers/net/wireless/ath/wil6210/debugfs.c
@@ -869,7 +869,6 @@ static ssize_t wil_write_file_txmgmt(struct file *file, const char __user *buf,
 
        params.buf = frame;
        params.len = len;
-       params.chan = wdev->preset_chandef.chan;
 
        rc = wil_cfg80211_mgmt_tx(wiphy, wdev, &params, NULL);
 

diff --git a/drivers/net/wireless/ath/wil6210/netdev.c b/drivers/net/wireless/ath/wil6210/netdev.c
index b641ac17a05374ad4ec3713c8d155c8803ededde..7ba4e0af8f5725dd6cb7436e603baef4865dcf25 100644 (file)
--- a/drivers/net/wireless/ath/wil6210/netdev.c
+++ b/drivers/net/wireless/ath/wil6210/netdev.c
@@ -150,7 +150,7 @@ void *wil_if_alloc(struct device *dev)
        wdev->iftype = NL80211_IFTYPE_STATION; /* TODO */
        /* default monitor channel */
        ch = wdev->wiphy->bands[NL80211_BAND_60GHZ]->channels;
-       cfg80211_chandef_create(&wdev->preset_chandef, ch, NL80211_CHAN_NO_HT);
+       cfg80211_chandef_create(&wil->monitor_chandef, ch, NL80211_CHAN_NO_HT);
 
        ndev = alloc_netdev(0, "wlan%d", NET_NAME_UNKNOWN, wil_dev_setup);
        if (!ndev) {

diff --git a/drivers/net/wireless/ath/wil6210/txrx.c b/drivers/net/wireless/ath/wil6210/txrx.c
index 62c04f078ebf17a458824568bfe81055dbbc0485..16b8a4e5201fc3765ab428d4e970031ac3fc967d 100644 (file)
--- a/drivers/net/wireless/ath/wil6210/txrx.c
+++ b/drivers/net/wireless/ath/wil6210/txrx.c
@@ -348,7 +348,6 @@ static int wil_vring_alloc_skb(struct wil6210_priv *wil, struct vring *vring,
 static void wil_rx_add_radiotap_header(struct wil6210_priv *wil,
                                       struct sk_buff *skb)
 {
-       struct wireless_dev *wdev = wil->wdev;
        struct wil6210_rtap {
                struct ieee80211_radiotap_header rthdr;
                /* fields should be in the order of bits in rthdr.it_present */
@@ -375,7 +374,7 @@ static void wil_rx_add_radiotap_header(struct wil6210_priv *wil,
        int rtap_len = sizeof(struct wil6210_rtap);
        int phy_length = 0; /* phy info header size, bytes */
        static char phy_data[128];
-       struct ieee80211_channel *ch = wdev->preset_chandef.chan;
+       struct ieee80211_channel *ch = wil->monitor_chandef.chan;
 
        if (rtap_include_phy_info) {
                rtap_len = sizeof(*rtap_vendor) + sizeof(*d);

diff --git a/drivers/net/wireless/ath/wil6210/wil6210.h b/drivers/net/wireless/ath/wil6210/wil6210.h
index da0b28c288e0571dd0af527354fe0a899304a566..0a0766b2c80a2b654371645e5ab4a0fc67f99fef 100644 (file)
--- a/drivers/net/wireless/ath/wil6210/wil6210.h
+++ b/drivers/net/wireless/ath/wil6210/wil6210.h
@@ -655,6 +655,7 @@ struct wil6210_priv {
        unsigned long last_fw_recovery; /* jiffies of last fw recovery */
        wait_queue_head_t wq; /* for all wait_event() use */
        /* profile */
+       struct cfg80211_chan_def monitor_chandef;
        u32 monitor_flags;
        u32 privacy; /* secure connection? */
        u8 hidden_ssid; /* relevant in AP mode */

diff --git a/drivers/net/wireless/ath/wil6210/wmi.c b/drivers/net/wireless/ath/wil6210/wmi.c
index 9b9882ca3bff23fbac7a0dff635d891c8f538272..2ab71bb32327f2eb0fc1963ff35ffce2e3ac2348 100644 (file)
--- a/drivers/net/wireless/ath/wil6210/wmi.c
+++ b/drivers/net/wireless/ath/wil6210/wmi.c
@@ -1782,7 +1782,7 @@ int wmi_rx_chain_add(struct wil6210_priv *wil, struct vring *vring)
        int rc;
 
        if (wdev->iftype == NL80211_IFTYPE_MONITOR) {
-               struct ieee80211_channel *ch = wdev->preset_chandef.chan;
+               struct ieee80211_channel *ch = wil->monitor_chandef.chan;
 
                cmd.sniffer_cfg.mode = cpu_to_le32(WMI_SNIFFER_ON);
                if (ch)