tipc: Combine bearer structure with tipc_bearer structure
authorAllan Stephens <Allan.Stephens@windriver.com>
Fri, 7 Jan 2011 18:00:11 +0000 (13:00 -0500)
committerPaul Gortmaker <paul.gortmaker@windriver.com>
Wed, 23 Feb 2011 23:05:05 +0000 (18:05 -0500)
commit2d627b92fd1e39d83c3ee0b9d410403f98cb3981
tree38fc08bfe87ed28785c7dd464577e947397dfa7c
parent23dd4cce387124ec3ea06ca30d17854ae4d9b772
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>
net/tipc/bcast.c
net/tipc/bearer.c
net/tipc/bearer.h
net/tipc/discover.c
net/tipc/discover.h
net/tipc/link.c
net/tipc/link.h
net/tipc/node.c