wil6210: P2P_DEVICE virtual interface support

Added support for the P2P_DEVICE virtual interface. This interface
is intended for P2P management operations such as discovery and
GO negotiation. Normally it is implemented by drivers to allow
a separate interface for P2P management with its own MAC address,
but for 11ad drivers it is needed to support P2P search, since it
cannot otherwise be separated from normal scan.

Since we only support a single interface/MAC address, we can't
easily separate between primary and P2P_DEVICE interfaces.
For example when a management packet arrives we can't tell for
which interface it is intended. To work around this, we store
a pointer to the interface where the last "radio operation" was
triggered such as scan or remain on channel, and we forward
management packets and scan results to this interface.

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@qca.qualcomm.com>

1 files changed, 6 insertions, 1 deletions

diff --git a/drivers/net/wireless/ath/wil6210/wmi.c b/drivers/net/wireless/ath/wil6210/wmi.c
index 4a1cdd256ef2..f0761758fac7 100644
--- a/drivers/net/wireless/ath/wil6210/wmi.c
+++ b/drivers/net/wireless/ath/wil6210/wmi.c
@@ -380,8 +380,10 @@ static void wmi_evt_rx_mgmt(struct wil6210_priv *wil, int id, void *d, int len)
                         wil_err(wil, "cfg80211_inform_bss_frame() failed\n");
                 }
         } else {
-                cfg80211_rx_mgmt(wil->wdev, freq, signal,
+                mutex_lock(&wil->p2p_wdev_mutex);
+                cfg80211_rx_mgmt(wil->radio_wdev, freq, signal,
                                  (void *)rx_mgmt_frame, d_len, 0);
+                mutex_unlock(&wil->p2p_wdev_mutex);
         }
 }
 
@@ -408,7 +410,10 @@ static void wmi_evt_scan_complete(struct wil6210_priv *wil, int id,
                              wil->scan_request, aborted);
 
                 del_timer_sync(&wil->scan_timer);
+                mutex_lock(&wil->p2p_wdev_mutex);
                 cfg80211_scan_done(wil->scan_request, aborted);
+                wil->radio_wdev = wil->wdev;
+                mutex_unlock(&wil->p2p_wdev_mutex);
                 wil->scan_request = NULL;
         } else {
                 wil_err(wil, "SCAN_COMPLETE while not scanning\n");