mac80211: mesh: fix mesh_pathtbl_init() error path

[linux-block.git] / net / mac80211 / mesh_pathtbl.c

diff --git a/net/mac80211/mesh_pathtbl.c b/net/mac80211/mesh_pathtbl.c
index 48f31ac9233c8b33558cf41a9b44412c7b1ad591..620ecf922408b1f870d4da8ab7eef02e4d33ab15 100644 (file)
--- a/net/mac80211/mesh_pathtbl.c
+++ b/net/mac80211/mesh_pathtbl.c
@@ -60,6 +60,7 @@ static struct mesh_table *mesh_table_alloc(void)
        atomic_set(&newtbl->entries,  0);
        spin_lock_init(&newtbl->gates_lock);
        spin_lock_init(&newtbl->walk_lock);
+       rhashtable_init(&newtbl->rhead, &mesh_rht_params);
 
        return newtbl;
 }
@@ -773,9 +774,6 @@ int mesh_pathtbl_init(struct ieee80211_sub_if_data *sdata)
                goto free_path;
        }
 
-       rhashtable_init(&tbl_path->rhead, &mesh_rht_params);
-       rhashtable_init(&tbl_mpp->rhead, &mesh_rht_params);
-
        sdata->u.mesh.mesh_paths = tbl_path;
        sdata->u.mesh.mpp_paths = tbl_mpp;