wifi: mac80211: Don't finalize CSA in IBSS mode if state is disconnected

[platform/kernel/linux-rpi.git] / net / mac80211 / mesh_pathtbl.c

diff --git a/net/mac80211/mesh_pathtbl.c b/net/mac80211/mesh_pathtbl.c
index 7cab1cf..acc1c29 100644 (file)
--- a/net/mac80211/mesh_pathtbl.c
+++ b/net/mac80211/mesh_pathtbl.c
@@ -47,32 +47,24 @@ static void mesh_path_rht_free(void *ptr, void *tblptr)
        mesh_path_free_rcu(tbl, mpath);
 }
 
-static struct mesh_table *mesh_table_alloc(void)
+static void mesh_table_init(struct mesh_table *tbl)
 {
-       struct mesh_table *newtbl;
+       INIT_HLIST_HEAD(&tbl->known_gates);
+       INIT_HLIST_HEAD(&tbl->walk_head);
+       atomic_set(&tbl->entries,  0);
+       spin_lock_init(&tbl->gates_lock);
+       spin_lock_init(&tbl->walk_lock);
 
-       newtbl = kmalloc(sizeof(struct mesh_table), GFP_ATOMIC);
-       if (!newtbl)
-               return NULL;
-
-       INIT_HLIST_HEAD(&newtbl->known_gates);
-       INIT_HLIST_HEAD(&newtbl->walk_head);
-       atomic_set(&newtbl->entries,  0);
-       spin_lock_init(&newtbl->gates_lock);
-       spin_lock_init(&newtbl->walk_lock);
-       if (rhashtable_init(&newtbl->rhead, &mesh_rht_params)) {
-               kfree(newtbl);
-               return NULL;
-       }
-
-       return newtbl;
+       /* rhashtable_init() may fail only in case of wrong
+        * mesh_rht_params
+        */
+       WARN_ON(rhashtable_init(&tbl->rhead, &mesh_rht_params));
 }
 
 static void mesh_table_free(struct mesh_table *tbl)
 {
        rhashtable_free_and_destroy(&tbl->rhead,
                                    mesh_path_rht_free, tbl);
-       kfree(tbl);
 }
 
 /**
@@ -238,13 +230,13 @@ static struct mesh_path *mpath_lookup(struct mesh_table *tbl, const u8 *dst,
 struct mesh_path *
 mesh_path_lookup(struct ieee80211_sub_if_data *sdata, const u8 *dst)
 {
-       return mpath_lookup(sdata->u.mesh.mesh_paths, dst, sdata);
+       return mpath_lookup(&sdata->u.mesh.mesh_paths, dst, sdata);
 }
 
 struct mesh_path *
 mpp_path_lookup(struct ieee80211_sub_if_data *sdata, const u8 *dst)
 {
-       return mpath_lookup(sdata->u.mesh.mpp_paths, dst, sdata);
+       return mpath_lookup(&sdata->u.mesh.mpp_paths, dst, sdata);
 }
 
 static struct mesh_path *
@@ -281,7 +273,7 @@ __mesh_path_lookup_by_idx(struct mesh_table *tbl, int idx)
 struct mesh_path *
 mesh_path_lookup_by_idx(struct ieee80211_sub_if_data *sdata, int idx)
 {
-       return __mesh_path_lookup_by_idx(sdata->u.mesh.mesh_paths, idx);
+       return __mesh_path_lookup_by_idx(&sdata->u.mesh.mesh_paths, idx);
 }
 
 /**
@@ -296,7 +288,7 @@ mesh_path_lookup_by_idx(struct ieee80211_sub_if_data *sdata, int idx)
 struct mesh_path *
 mpp_path_lookup_by_idx(struct ieee80211_sub_if_data *sdata, int idx)
 {
-       return __mesh_path_lookup_by_idx(sdata->u.mesh.mpp_paths, idx);
+       return __mesh_path_lookup_by_idx(&sdata->u.mesh.mpp_paths, idx);
 }
 
 /**
@@ -309,7 +301,7 @@ int mesh_path_add_gate(struct mesh_path *mpath)
        int err;
 
        rcu_read_lock();
-       tbl = mpath->sdata->u.mesh.mesh_paths;
+       tbl = &mpath->sdata->u.mesh.mesh_paths;
 
        spin_lock_bh(&mpath->state_lock);
        if (mpath->is_gate) {
@@ -418,7 +410,7 @@ struct mesh_path *mesh_path_add(struct ieee80211_sub_if_data *sdata,
        if (!new_mpath)
                return ERR_PTR(-ENOMEM);
 
-       tbl = sdata->u.mesh.mesh_paths;
+       tbl = &sdata->u.mesh.mesh_paths;
        spin_lock_bh(&tbl->walk_lock);
        mpath = rhashtable_lookup_get_insert_fast(&tbl->rhead,
                                                  &new_mpath->rhash,
@@ -460,7 +452,7 @@ int mpp_path_add(struct ieee80211_sub_if_data *sdata,
                return -ENOMEM;
 
        memcpy(new_mpath->mpp, mpp, ETH_ALEN);
-       tbl = sdata->u.mesh.mpp_paths;
+       tbl = &sdata->u.mesh.mpp_paths;
 
        spin_lock_bh(&tbl->walk_lock);
        ret = rhashtable_lookup_insert_fast(&tbl->rhead,
@@ -489,7 +481,7 @@ int mpp_path_add(struct ieee80211_sub_if_data *sdata,
 void mesh_plink_broken(struct sta_info *sta)
 {
        struct ieee80211_sub_if_data *sdata = sta->sdata;
-       struct mesh_table *tbl = sdata->u.mesh.mesh_paths;
+       struct mesh_table *tbl = &sdata->u.mesh.mesh_paths;
        static const u8 bcast[ETH_ALEN] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
        struct mesh_path *mpath;
 
@@ -548,7 +540,7 @@ static void __mesh_path_del(struct mesh_table *tbl, struct mesh_path *mpath)
 void mesh_path_flush_by_nexthop(struct sta_info *sta)
 {
        struct ieee80211_sub_if_data *sdata = sta->sdata;
-       struct mesh_table *tbl = sdata->u.mesh.mesh_paths;
+       struct mesh_table *tbl = &sdata->u.mesh.mesh_paths;
        struct mesh_path *mpath;
        struct hlist_node *n;
 
@@ -563,7 +555,7 @@ void mesh_path_flush_by_nexthop(struct sta_info *sta)
 static void mpp_flush_by_proxy(struct ieee80211_sub_if_data *sdata,
                               const u8 *proxy)
 {
-       struct mesh_table *tbl = sdata->u.mesh.mpp_paths;
+       struct mesh_table *tbl = &sdata->u.mesh.mpp_paths;
        struct mesh_path *mpath;
        struct hlist_node *n;
 
@@ -597,8 +589,8 @@ static void table_flush_by_iface(struct mesh_table *tbl)
  */
 void mesh_path_flush_by_iface(struct ieee80211_sub_if_data *sdata)
 {
-       table_flush_by_iface(sdata->u.mesh.mesh_paths);
-       table_flush_by_iface(sdata->u.mesh.mpp_paths);
+       table_flush_by_iface(&sdata->u.mesh.mesh_paths);
+       table_flush_by_iface(&sdata->u.mesh.mpp_paths);
 }
 
 /**
@@ -644,7 +636,7 @@ int mesh_path_del(struct ieee80211_sub_if_data *sdata, const u8 *addr)
        /* flush relevant mpp entries first */
        mpp_flush_by_proxy(sdata, addr);
 
-       err = table_path_del(sdata->u.mesh.mesh_paths, sdata, addr);
+       err = table_path_del(&sdata->u.mesh.mesh_paths, sdata, addr);
        sdata->u.mesh.mesh_paths_generation++;
        return err;
 }
@@ -682,7 +674,7 @@ int mesh_path_send_to_gates(struct mesh_path *mpath)
        struct mesh_path *gate;
        bool copy = false;
 
-       tbl = sdata->u.mesh.mesh_paths;
+       tbl = &sdata->u.mesh.mesh_paths;
 
        rcu_read_lock();
        hlist_for_each_entry_rcu(gate, &tbl->known_gates, gate_list) {
@@ -762,29 +754,10 @@ void mesh_path_fix_nexthop(struct mesh_path *mpath, struct sta_info *next_hop)
        mesh_path_tx_pending(mpath);
 }
 
-int mesh_pathtbl_init(struct ieee80211_sub_if_data *sdata)
+void mesh_pathtbl_init(struct ieee80211_sub_if_data *sdata)
 {
-       struct mesh_table *tbl_path, *tbl_mpp;
-       int ret;
-
-       tbl_path = mesh_table_alloc();
-       if (!tbl_path)
-               return -ENOMEM;
-
-       tbl_mpp = mesh_table_alloc();
-       if (!tbl_mpp) {
-               ret = -ENOMEM;
-               goto free_path;
-       }
-
-       sdata->u.mesh.mesh_paths = tbl_path;
-       sdata->u.mesh.mpp_paths = tbl_mpp;
-
-       return 0;
-
-free_path:
-       mesh_table_free(tbl_path);
-       return ret;
+       mesh_table_init(&sdata->u.mesh.mesh_paths);
+       mesh_table_init(&sdata->u.mesh.mpp_paths);
 }
 
 static
@@ -806,12 +779,12 @@ void mesh_path_tbl_expire(struct ieee80211_sub_if_data *sdata,
 
 void mesh_path_expire(struct ieee80211_sub_if_data *sdata)
 {
-       mesh_path_tbl_expire(sdata, sdata->u.mesh.mesh_paths);
-       mesh_path_tbl_expire(sdata, sdata->u.mesh.mpp_paths);
+       mesh_path_tbl_expire(sdata, &sdata->u.mesh.mesh_paths);
+       mesh_path_tbl_expire(sdata, &sdata->u.mesh.mpp_paths);
 }
 
 void mesh_pathtbl_unregister(struct ieee80211_sub_if_data *sdata)
 {
-       mesh_table_free(sdata->u.mesh.mesh_paths);
-       mesh_table_free(sdata->u.mesh.mpp_paths);
+       mesh_table_free(&sdata->u.mesh.mesh_paths);
+       mesh_table_free(&sdata->u.mesh.mpp_paths);
 }