lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mac80211: Merge error paths in mesh_table_grow().

Browse Source 
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>
This commit is contained in:
Pavel Emelyanov
2008-05-07 19:55:59 +04:00
committed by John W. Linville
parent 3282aea9ea
commit a3538b19a6
1 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
net/mac80211/mesh.c
View File

@@ -350,20 +350,15 @@ struct mesh_table *mesh_table_grow(struct mesh_table *tbl)
struct mesh_table *newtbl; struct mesh_table *newtbl;
struct hlist_head *oldhash; struct hlist_head *oldhash;
struct hlist_node *p, *q; struct hlist_node *p, *q;
int err = 0;
int i; int i;
if (atomic_read(&tbl->entries) if (atomic_read(&tbl->entries)
< tbl->mean_chain_len * (tbl->hash_mask + 1)) { < tbl->mean_chain_len * (tbl->hash_mask + 1))
err = -EPERM;
goto endgrow; goto endgrow;
}
newtbl = mesh_table_alloc(tbl->size_order + 1); newtbl = mesh_table_alloc(tbl->size_order + 1);
if (!newtbl) { if (!newtbl)
err = -ENOMEM;
goto endgrow; goto endgrow;
}
newtbl->free_node = tbl->free_node; newtbl->free_node = tbl->free_node;
newtbl->mean_chain_len = tbl->mean_chain_len; newtbl->mean_chain_len = tbl->mean_chain_len;
@@ -376,11 +371,7 @@ struct mesh_table *mesh_table_grow(struct mesh_table *tbl)
if (tbl->copy_node(p, newtbl) < 0) if (tbl->copy_node(p, newtbl) < 0)
goto errcopy; goto errcopy;
endgrow: return newtbl;
if (err)
return NULL;
else
return newtbl;
errcopy: errcopy:
for (i = 0; i <= newtbl->hash_mask; i++) { for (i = 0; i <= newtbl->hash_mask; i++) {
@@ -390,6 +381,7 @@ errcopy:
kfree(newtbl->hash_buckets); kfree(newtbl->hash_buckets);
kfree(newtbl->hashwlock); kfree(newtbl->hashwlock);
kfree(newtbl); kfree(newtbl);
endgrow:
return NULL; return NULL;
} }