]> git.openpandora.org Git - pandora-kernel.git/commitdiff
tipc: involve namespace infrastructure
authorYing Xue <ying.xue@windriver.com>
Fri, 9 Jan 2015 07:27:04 +0000 (15:27 +0800)
committerDavid S. Miller <davem@davemloft.net>
Mon, 12 Jan 2015 21:24:32 +0000 (16:24 -0500)
Involve namespace infrastructure, make the "tipc_net_id" global
variable aware of per namespace, and rename it to "net_id". In
order that the conversion can be successfully done, an instance
of networking namespace must be passed to relevant functions,
allowing them to access the "net_id" variable of per namespace.

Signed-off-by: Ying Xue <ying.xue@windriver.com>
Tested-by: Tero Aho <Tero.Aho@coriant.com>
Reviewed-by: Jon Maloy <jon.maloy@ericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
15 files changed:
net/tipc/bcast.c
net/tipc/bcast.h
net/tipc/bearer.c
net/tipc/bearer.h
net/tipc/config.c
net/tipc/config.h
net/tipc/core.c
net/tipc/core.h
net/tipc/discover.c
net/tipc/discover.h
net/tipc/link.c
net/tipc/msg.c
net/tipc/net.c
net/tipc/net.h
net/tipc/netlink.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc net/tipc/core.c
Simple merge
diff --cc net/tipc/core.h
Simple merge
Simple merge
Simple merge
diff --cc net/tipc/link.c
Simple merge
diff --cc net/tipc/msg.c
Simple merge
diff --cc net/tipc/net.c
Simple merge
diff --cc net/tipc/net.h
Simple merge
Simple merge