From 148ada2356695534d3033ae7e95c0932ecc93a4c Mon Sep 17 00:00:00 2001
From: Pavel Emelyanov <xemul@openvz.org>
Date: Wed, 7 May 2008 19:57:11 +0400
Subject: [PATCH] --- yaml --- r: 102733 b: refs/heads/master c:
 bd9b448f4c0a514559bdae4ca18ca3e8cd999c6d h: refs/heads/master i:   102731:
 04cbbdd04df3d0de20034289a1e83c34464fd248 v: v3

---
 [refs]                    |  2 +-
 trunk/net/mac80211/mesh.c | 15 +++++++++------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 780160c3f9b3..d9acbc3b9f2d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a3538b19a6d226f9d3d9b18865468370009dec55
+refs/heads/master: bd9b448f4c0a514559bdae4ca18ca3e8cd999c6d
diff --git a/trunk/net/mac80211/mesh.c b/trunk/net/mac80211/mesh.c
index cbce001f8f23..b5933b271491 100644
--- a/trunk/net/mac80211/mesh.c
+++ b/trunk/net/mac80211/mesh.c
@@ -315,6 +315,13 @@ struct mesh_table *mesh_table_alloc(int size_order)
 	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)
 {
 	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]);
 	}
-	kfree(tbl->hash_buckets);
-	kfree(tbl->hashwlock);
-	kfree(tbl);
+	__mesh_table_free(tbl);
 }
 
 static void ieee80211_mesh_path_timer(unsigned long data)
@@ -378,9 +383,7 @@ struct mesh_table *mesh_table_grow(struct mesh_table *tbl)
 		hlist_for_each_safe(p, q, &newtbl->hash_buckets[i])
 			tbl->free_node(p, 0);
 	}
-	kfree(newtbl->hash_buckets);
-	kfree(newtbl->hashwlock);
-	kfree(newtbl);
+	__mesh_table_free(tbl);
 endgrow:
 	return NULL;
 }