cfg80211: add channel tracking for AP and mesh

We need to know which channel is used by a running
AP and mesh for channel context accounting and
finding matching/active interface combination.

STA/IBSS have current_bss already which allows us
to check which channel a vif is tuned to.
Non-fixed channel IBSS can be handled with
additional changes.

Monitor mode is going to be handled differently.

Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

1 files changed, 14 insertions, 4 deletions

diff --git a/net/wireless/mesh.c b/net/wireless/mesh.c
index 3b73b07486cf..bab381344723 100644
--- a/net/wireless/mesh.c
+++ b/net/wireless/mesh.c
@@ -159,6 +159,7 @@ int __cfg80211_join_mesh(struct cfg80211_registered_device *rdev,
         if (!err) {
                 memcpy(wdev->ssid, setup->mesh_id, setup->mesh_id_len);
                 wdev->mesh_id_len = setup->mesh_id_len;
+                wdev->channel = setup->channel;
         }
 
         return err;
@@ -184,6 +185,7 @@ int cfg80211_set_mesh_freq(struct cfg80211_registered_device *rdev,
                            enum nl80211_channel_type channel_type)
 {
         struct ieee80211_channel *channel;
+        int err;
 
         channel = rdev_freq_to_chan(rdev, freq, channel_type);
         if (!channel || !cfg80211_can_beacon_sec_chan(&rdev->wiphy,
@@ -205,9 +207,14 @@ int cfg80211_set_mesh_freq(struct cfg80211_registered_device *rdev,
 
                 if (!netif_running(wdev->netdev))
                         return -ENETDOWN;
-                return rdev->ops->libertas_set_mesh_channel(&rdev->wiphy,
-                                                            wdev->netdev,
-                                                            channel);
+
+                err = rdev->ops->libertas_set_mesh_channel(&rdev->wiphy,
+                                                           wdev->netdev,
+                                                           channel);
+                if (!err)
+                        wdev->channel = channel;
+
+                return err;
         }
 
         if (wdev->mesh_id_len)
@@ -249,8 +256,11 @@ static int __cfg80211_leave_mesh(struct cfg80211_registered_device *rdev,
                 return -ENOTCONN;
 
         err = rdev->ops->leave_mesh(&rdev->wiphy, dev);
-        if (!err)
+        if (!err) {
                 wdev->mesh_id_len = 0;
+                wdev->channel = NULL;
+        }
+
         return err;
 }