Commit a3538b19 authored by Pavel Emelyanov's avatar Pavel Emelyanov Committed by John W. Linville
Browse files

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: default avatarPavel Emelyanov <xemul@openvz.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 3282aea9

net/mac80211/mesh.c

+4 −12
Original line number Diff line number Diff line
@@ -350,20 +350,15 @@ struct mesh_table *mesh_table_grow(struct mesh_table *tbl) 
	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,10 +371,6 @@ struct mesh_table *mesh_table_grow(struct mesh_table *tbl) 
			if (tbl->copy_node(p, newtbl) < 0)

				goto errcopy;



endgrow:

	if (err)

		return NULL;

	else

	return newtbl;



errcopy:
@@ -390,6 +381,7 @@ struct mesh_table *mesh_table_grow(struct mesh_table *tbl) 
	kfree(newtbl->hash_buckets);

	kfree(newtbl->hashwlock);

	kfree(newtbl);

endgrow:

	return NULL;

}