diff options
| author | Jon Maloy <jon.maloy@ericsson.com> | 2018-03-22 22:42:49 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-03-23 20:12:18 +0300 |
| commit | 23fd3eace088ab1872ee59c19191a119ec779ac9 (patch) | |
| tree | 9469f540f7bd0279b0359bff04362877bd28e27b /net/tipc/name_distr.c | |
| parent | b89afb116ca2830cc982624f93e888860868a84b (diff) | |
| download | linux-23fd3eace088ab1872ee59c19191a119ec779ac9.tar.xz | |
tipc: remove direct accesses to own_addr field in struct tipc_net
As a preparation to changing the addressing structure of TIPC we replace
all direct accesses to the tipc_net::own_addr field with the function
dedicated for this, tipc_own_addr().
There are no changes to program logics in this commit.
Acked-by: Ying Xue <ying.xue@windriver.com>
Signed-off-by: Jon Maloy <jon.maloy@ericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc/name_distr.c')
| -rw-r--r-- | net/tipc/name_distr.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/net/tipc/name_distr.c b/net/tipc/name_distr.c index 28d095a7d8bb..7e571f4f47bc 100644 --- a/net/tipc/name_distr.c +++ b/net/tipc/name_distr.c @@ -68,14 +68,14 @@ static void publ_to_item(struct distr_item *i, struct publication *p) static struct sk_buff *named_prepare_buf(struct net *net, u32 type, u32 size, u32 dest) { - struct tipc_net *tn = net_generic(net, tipc_net_id); struct sk_buff *buf = tipc_buf_acquire(INT_H_SIZE + size, GFP_ATOMIC); + u32 self = tipc_own_addr(net); struct tipc_msg *msg; if (buf != NULL) { msg = buf_msg(buf); - tipc_msg_init(tn->own_addr, msg, NAME_DISTRIBUTOR, type, - INT_H_SIZE, dest); + tipc_msg_init(self, msg, NAME_DISTRIBUTOR, + type, INT_H_SIZE, dest); msg_set_size(msg, INT_H_SIZE + size); } return buf; @@ -382,13 +382,14 @@ void tipc_named_reinit(struct net *net) struct name_table *nt = tipc_name_table(net); struct tipc_net *tn = tipc_net(net); struct publication *publ; + u32 self = tipc_own_addr(net); spin_lock_bh(&tn->nametbl_lock); list_for_each_entry_rcu(publ, &nt->node_scope, binding_node) - publ->node = tn->own_addr; + publ->node = self; list_for_each_entry_rcu(publ, &nt->cluster_scope, binding_node) - publ->node = tn->own_addr; + publ->node = self; spin_unlock_bh(&tn->nametbl_lock); } |