diff options
author | Pavel Emelyanov <xemul@openvz.org> | 2008-05-07 17:47:01 +0200 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-05-22 03:47:42 +0200 |
commit | 4caf86c6928cfaca270327bc944f901c2e2a8f50 (patch) | |
tree | 6f6a1ecac1a4399c6597510f4076e19b1e30f10e /net/mac80211/mesh.h | |
parent | mac80211: Fix one more call to synchronize_rcu in atomic context. (diff) | |
download | linux-4caf86c6928cfaca270327bc944f901c2e2a8f50.tar.xz linux-4caf86c6928cfaca270327bc944f901c2e2a8f50.zip |
mac80211: Prepare mesh_table_grow to failing copy_node callback.
The mesh_path_node_copy() performs kmalloc() and thus - may fail
(well, it does not now, but I'm fixing this right now). Its caller -
the mesh_table_grow() - isn't prepared for such a trick yet.
This preparation is just flush the new hash and make copy_node()
return an int value.
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/mesh.h')
-rw-r--r-- | net/mac80211/mesh.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/mesh.h b/net/mac80211/mesh.h index 2e161f6d8288..669eafafe497 100644 --- a/net/mac80211/mesh.h +++ b/net/mac80211/mesh.h @@ -109,7 +109,7 @@ struct mesh_table { __u32 hash_rnd; /* Used for hash generation */ atomic_t entries; /* Up to MAX_MESH_NEIGHBOURS */ void (*free_node) (struct hlist_node *p, bool free_leafs); - void (*copy_node) (struct hlist_node *p, struct mesh_table *newtbl); + int (*copy_node) (struct hlist_node *p, struct mesh_table *newtbl); int size_order; int mean_chain_len; }; |