mac80211: clean up mesh code

There's various code with strange indentation,
questionable loop and locking constructs, etc.

The bigger change is moving the "sdata" argument
to the first argument of all functions, like all
other mac80211 functions that have one.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>

1 files changed, 7 insertions, 7 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;