10 files changed, 252 insertions, 263 deletions

diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index 179dcbd8be1c..09d96a8f6c2c 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -1500,13 +1500,13 @@ static int ieee80211_add_mpath(struct wiphy *wiphy, struct net_device *dev,
                 return -ENOENT;
         }
 
-        err = mesh_path_add(dst, sdata);
+        err = mesh_path_add(sdata, dst);
         if (err) {
                 rcu_read_unlock();
                 return err;
         }
 
-        mpath = mesh_path_lookup(dst, sdata);
+        mpath = mesh_path_lookup(sdata, dst);
         if (!mpath) {
                 rcu_read_unlock();
                 return -ENXIO;
@@ -1518,12 +1518,12 @@ static int ieee80211_add_mpath(struct wiphy *wiphy, struct net_device *dev,
 }
 
 static int ieee80211_del_mpath(struct wiphy *wiphy, struct net_device *dev,
-                                 u8 *dst)
+                               u8 *dst)
 {
         struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
 
         if (dst)
-                return mesh_path_del(dst, sdata);
+                return mesh_path_del(sdata, dst);
 
         mesh_path_flush_by_iface(sdata);
         return 0;
@@ -1547,7 +1547,7 @@ static int ieee80211_change_mpath(struct wiphy *wiphy,
                 return -ENOENT;
         }
 
-        mpath = mesh_path_lookup(dst, sdata);
+        mpath = mesh_path_lookup(sdata, dst);
         if (!mpath) {
                 rcu_read_unlock();
                 return -ENOENT;
@@ -1611,7 +1611,7 @@ static int ieee80211_get_mpath(struct wiphy *wiphy, struct net_device *dev,
         sdata = IEEE80211_DEV_TO_SUB_IF(dev);
 
         rcu_read_lock();
-        mpath = mesh_path_lookup(dst, sdata);
+        mpath = mesh_path_lookup(sdata, dst);
         if (!mpath) {
                 rcu_read_unlock();
                 return -ENOENT;
@@ -1632,7 +1632,7 @@ static int ieee80211_dump_mpath(struct wiphy *wiphy, struct net_device *dev,
         sdata = IEEE80211_DEV_TO_SUB_IF(dev);
 
         rcu_read_lock();
-        mpath = mesh_path_lookup_by_idx(idx, sdata);
+        mpath = mesh_path_lookup_by_idx(sdata, idx);
         if (!mpath) {
                 rcu_read_unlock();
                 return -ENOENT;
diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index f9747689d604..d0dd11153a6c 100644
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -1173,8 +1173,7 @@ static void __exit ieee80211_exit(void)
         rc80211_minstrel_ht_exit();
         rc80211_minstrel_exit();
 
-        if (mesh_allocated)
-                ieee80211s_stop();
+        ieee80211s_stop();
 
         ieee80211_iface_exit();
 
diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c
index a77d40ed4e61..b0223326d9cd 100644
--- a/net/mac80211/mesh.c
+++ b/net/mac80211/mesh.c
@@ -17,7 +17,7 @@
 #define TMR_RUNNING_MP  1
 #define TMR_RUNNING_MPR 2
 
-int mesh_allocated;
+static int mesh_allocated;
 static struct kmem_cache *rm_cache;
 
 bool mesh_action_is_path_sel(struct ieee80211_mgmt *mgmt)
@@ -36,6 +36,8 @@ void ieee80211s_init(void)
 
 void ieee80211s_stop(void)
 {
+        if (!mesh_allocated)
+                return;
         mesh_pathtbl_unregister();
         kmem_cache_destroy(rm_cache);
 }
@@ -90,24 +92,22 @@ bool mesh_matches_local(struct ieee80211_sub_if_data *sdata,
              (ifmsh->mesh_cc_id == ie->mesh_config->meshconf_congest) &&
              (ifmsh->mesh_sp_id == ie->mesh_config->meshconf_synch) &&
              (ifmsh->mesh_auth_id == ie->mesh_config->meshconf_auth)))
-                goto mismatch;
+                return false;
 
         ieee80211_sta_get_rates(local, ie, ieee80211_get_sdata_band(sdata),
                                 &basic_rates);
 
         if (sdata->vif.bss_conf.basic_rates != basic_rates)
-                goto mismatch;
+                return false;
 
         ieee80211_ht_oper_to_chandef(sdata->vif.bss_conf.chandef.chan,
                                      ie->ht_operation, &sta_chan_def);
 
         if (!cfg80211_chandef_compatible(&sdata->vif.bss_conf.chandef,
                                          &sta_chan_def))
-                goto mismatch;
+                return false;
 
         return true;
-mismatch:
-        return false;
 }
 
 /**
@@ -118,7 +118,7 @@ mismatch:
 bool mesh_peer_accepts_plinks(struct ieee802_11_elems *ie)
 {
         return (ie->mesh_config->meshconf_cap &
-            IEEE80211_MESHCONF_CAPAB_ACCEPT_PLINKS) != 0;
+                        IEEE80211_MESHCONF_CAPAB_ACCEPT_PLINKS) != 0;
 }
 
 /**
@@ -196,11 +196,12 @@ void mesh_rmc_free(struct ieee80211_sub_if_data *sdata)
         if (!sdata->u.mesh.rmc)
                 return;
 
-        for (i = 0; i < RMC_BUCKETS; i++)
+        for (i = 0; i < RMC_BUCKETS; i++) {
                 list_for_each_entry_safe(p, n, &rmc->bucket[i], list) {
                         list_del(&p->list);
                         kmem_cache_free(rm_cache, p);
                 }
+        }
 
         kfree(rmc);
         sdata->u.mesh.rmc = NULL;
@@ -209,6 +210,7 @@ void mesh_rmc_free(struct ieee80211_sub_if_data *sdata)
 /**
  * mesh_rmc_check - Check frame in recent multicast cache and add if absent.
  *
+ * @sdata:      interface
  * @sa:         source address
  * @mesh_hdr:   mesh_header