diff options
| author |   Allan Stephens <Allan.Stephens@windriver.com> | 2011-01-07 13:00:11 -0500 |
|---|---|---|
| committer |   Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-02-23 18:05:05 -0500 |
| commit | 2d627b92fd1e39d83c3ee0b9d410403f98cb3981 (patch) | |
| tree | 38fc08bfe87ed28785c7dd464577e947397dfa7c /net/tipc/discover.h | |
| parent | tipc: Combine port structure with tipc_port structure (diff) | |
| download | linux-dev-2d627b92fd1e39d83c3ee0b9d410403f98cb3981.tar.xz linux-dev-2d627b92fd1e39d83c3ee0b9d410403f98cb3981.zip | |
tipc: Combine bearer structure with tipc_bearer structure
Combines two distinct structures containing information about a TIPC bearer
into a single structure. The structures were previously kept separate so
that public information about a bearer could be made available to plug-in
media types using TIPC's native API, while the remaining information was
kept private for use by TIPC itself. However, now that the native API has
been removed there is no longer any need for this arrangement.
Since one of the structures was already embedded within the other, the
change largely involves replacing instances of "publ.foo" with "foo".
The changes do not otherwise alter the operation of TIPC bearers.
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 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/tipc/discover.h b/net/tipc/discover.h index d2c3cffb79fc..4046d7743f07 100644 --- a/net/tipc/discover.h +++ b/net/tipc/discover.h @@ -2,7 +2,7 @@ * net/tipc/discover.h * * Copyright (c) 2003-2006, Ericsson AB - * Copyright (c) 2005, Wind River Systems + * Copyright (c) 2005, 2010-2011, Wind River Systems * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -39,13 +39,13 @@ struct link_req; -struct link_req *tipc_disc_init_link_req(struct bearer *b_ptr, +struct link_req *tipc_disc_init_link_req(struct tipc_bearer *b_ptr, const struct tipc_media_addr *dest, u32 dest_domain, u32 req_links); 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 bearer *b_ptr); +void tipc_disc_recv_msg(struct sk_buff *buf, struct tipc_bearer *b_ptr); #endif |