mac80211: Merge error paths in mesh_table_grow().
This is the first (of two) clean ups after the fixes above.
The err variable is not even required after this cleaning.
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c
index ca81d00..cbce001 100644
--- a/net/mac80211/mesh.c
+++ b/net/mac80211/mesh.c
@@ -350,20 +350,15 @@
struct mesh_table *newtbl;
struct hlist_head *oldhash;
struct hlist_node *p, *q;
- int err = 0;
int i;
if (atomic_read(&tbl->entries)
- < tbl->mean_chain_len * (tbl->hash_mask + 1)) {
- err = -EPERM;
+ < tbl->mean_chain_len * (tbl->hash_mask + 1))
goto endgrow;
- }
newtbl = mesh_table_alloc(tbl->size_order + 1);
- if (!newtbl) {
- err = -ENOMEM;
+ if (!newtbl)
goto endgrow;
- }
newtbl->free_node = tbl->free_node;
newtbl->mean_chain_len = tbl->mean_chain_len;
@@ -376,11 +371,7 @@
if (tbl->copy_node(p, newtbl) < 0)
goto errcopy;
-endgrow:
- if (err)
- return NULL;
- else
- return newtbl;
+ return newtbl;
errcopy:
for (i = 0; i <= newtbl->hash_mask; i++) {
@@ -390,6 +381,7 @@
kfree(newtbl->hash_buckets);
kfree(newtbl->hashwlock);
kfree(newtbl);
+endgrow:
return NULL;
}