diff options
| author | Ying Xue <ying.xue@windriver.com> | 2015-01-09 15:27:04 +0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-01-12 16:24:32 -0500 |
| commit | c93d3baa24095887005647984cff5de8c63d3611 (patch) | |
| tree | 1c7917d92605991696960243fe97dfef9d14913a /net/tipc/bearer.h | |
| parent | 54fef04ad05f15984082c225fe47ce6af8ea1c5c (diff) | |
| download | blackbird-op-linux-c93d3baa24095887005647984cff5de8c63d3611.tar.gz blackbird-op-linux-c93d3baa24095887005647984cff5de8c63d3611.zip | |
tipc: involve namespace infrastructure
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>
Diffstat (limited to 'net/tipc/bearer.h')
| -rw-r--r-- | net/tipc/bearer.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/tipc/bearer.h b/net/tipc/bearer.h index 2c1230ac5dfe..43f683aebbbe 100644 --- a/net/tipc/bearer.h +++ b/net/tipc/bearer.h @@ -165,8 +165,9 @@ extern struct tipc_bearer __rcu *bearer_list[]; * TIPC routines available to supported media types */ -void tipc_rcv(struct sk_buff *skb, struct tipc_bearer *tb_ptr); -int tipc_enable_bearer(const char *bearer_name, u32 disc_domain, u32 priority); +void tipc_rcv(struct net *net, struct sk_buff *skb, struct tipc_bearer *b_ptr); +int tipc_enable_bearer(struct net *net, const char *bearer_name, + u32 disc_domain, u32 priority); int tipc_disable_bearer(const char *name); /* |
