diff options
| author | Allan Stephens <Allan.Stephens@windriver.com> | 2011-04-21 13:58:26 -0500 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-05-10 16:03:59 -0400 |
| commit | 3a777ff8b14456e15991c9fcc225943453dc3a75 (patch) | |
| tree | 50f2b2ca5c9a2a4a1df107da4db00611ae938f32 /net/tipc/discover.h | |
| parent | dc63d91eb1cf74233c68b0058dcd477f5d019d02 (diff) | |
| download | linux-stable-3a777ff8b14456e15991c9fcc225943453dc3a75.tar.gz linux-stable-3a777ff8b14456e15991c9fcc225943453dc3a75.tar.bz2 linux-stable-3a777ff8b14456e15991c9fcc225943453dc3a75.zip | |
tipc: Enhance handling of discovery object creation failures
Modifies bearer creation and deletion code to improve handling of
scenarios when a neighbor discovery object cannot be created. The
creation routine now aborts the creation of a bearer if its discovery
object cannot be created, and deletes the newly created bearer, rather
than failing quietly and leaving an unusable bearer hanging around.
Since the exit via the goto label really isn't a definitive failure
in all cases, relabel it appropriately.
Signed-off-by: Allan Stephens <Allan.Stephens@windriver.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Diffstat (limited to 'net/tipc/discover.h')
| -rw-r--r-- | net/tipc/discover.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/net/tipc/discover.h b/net/tipc/discover.h index e48a167e47b2..d6e44e3dcdbc 100644 --- a/net/tipc/discover.h +++ b/net/tipc/discover.h @@ -39,12 +39,10 @@ struct link_req; -struct link_req *tipc_disc_init_link_req(struct tipc_bearer *b_ptr, - const struct tipc_media_addr *dest, - u32 dest_domain); +int tipc_disc_create(struct tipc_bearer *b_ptr, struct tipc_media_addr *dest, + u32 dest_domain); +void tipc_disc_delete(struct link_req *req); void tipc_disc_update_link_req(struct link_req *req); -void tipc_disc_stop_link_req(struct link_req *req); - void tipc_disc_recv_msg(struct sk_buff *buf, struct tipc_bearer *b_ptr); #endif |