Browse Source

mac80211: Consolidate hash kfree-ing in mesh.c.

There are already two places, that kfree the mesh_table and
its buckets.

Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Pavel Emelyanov 17 years ago
parent
commit
bd9b448f4c
1 changed files with 9 additions and 6 deletions
  1. 9 6
      net/mac80211/mesh.c

+ 9 - 6
net/mac80211/mesh.c

@@ -315,6 +315,13 @@ struct mesh_table *mesh_table_alloc(int size_order)
 	return newtbl;
 	return newtbl;
 }
 }
 
 
+static void __mesh_table_free(struct mesh_table *tbl)
+{
+	kfree(tbl->hash_buckets);
+	kfree(tbl->hashwlock);
+	kfree(tbl);
+}
+
 void mesh_table_free(struct mesh_table *tbl, bool free_leafs)
 void mesh_table_free(struct mesh_table *tbl, bool free_leafs)
 {
 {
 	struct hlist_head *mesh_hash;
 	struct hlist_head *mesh_hash;
@@ -330,9 +337,7 @@ void mesh_table_free(struct mesh_table *tbl, bool free_leafs)
 		}
 		}
 		spin_unlock(&tbl->hashwlock[i]);
 		spin_unlock(&tbl->hashwlock[i]);
 	}
 	}
-	kfree(tbl->hash_buckets);
-	kfree(tbl->hashwlock);
-	kfree(tbl);
+	__mesh_table_free(tbl);
 }
 }
 
 
 static void ieee80211_mesh_path_timer(unsigned long data)
 static void ieee80211_mesh_path_timer(unsigned long data)
@@ -378,9 +383,7 @@ errcopy:
 		hlist_for_each_safe(p, q, &newtbl->hash_buckets[i])
 		hlist_for_each_safe(p, q, &newtbl->hash_buckets[i])
 			tbl->free_node(p, 0);
 			tbl->free_node(p, 0);
 	}
 	}
-	kfree(newtbl->hash_buckets);
-	kfree(newtbl->hashwlock);
-	kfree(newtbl);
+	__mesh_table_free(tbl);
 endgrow:
 endgrow:
 	return NULL;
 	return NULL;
 }
 }