diff options
| author | David S. Miller <davem@davemloft.net> | 2015-11-20 14:06:11 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-11-20 14:06:11 -0500 |
| commit | 6b99c6d558bbfaba0292db1996199325a74c7d02 (patch) | |
| tree | 5f8006781ad005be1e5592811d211b6b21425abd /net/tipc/name_table.c | |
| parent | 12ded5cae60f62eddaed7cc8f38f7a830571fc3d (diff) | |
| parent | 1a90632da8c17a27e0c93538ee987764adee43a5 (diff) | |
| download | linux-6b99c6d558bbfaba0292db1996199325a74c7d02.tar.bz2 | |
Merge branch 'tipc-cleanups-improvements'
Jon Maloy says:
====================
tipc: some cleanups and improvements
This series mostly contains cleanups and cosmetic code changes.
The only real functional change is in #4 and #5, where we change the
locking structure for nodes and links in order to permit full
concurrency between links working in parallel on different interfaces.
Since the groundwork for this has been done in previous commit series,
this change constitutes only the final, small step to achieve that goal.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc/name_table.c')
| -rw-r--r-- | net/tipc/name_table.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/tipc/name_table.c b/net/tipc/name_table.c index 0f47f08bf38f..91fce70291a8 100644 --- a/net/tipc/name_table.c +++ b/net/tipc/name_table.c @@ -42,6 +42,7 @@ #include "subscr.h" #include "bcast.h" #include "addr.h" +#include "node.h" #include <net/genetlink.h> #define TIPC_NAMETBL_SIZE 1024 /* must be a power of 2 */ @@ -677,7 +678,7 @@ struct publication *tipc_nametbl_publish(struct net *net, u32 type, u32 lower, spin_unlock_bh(&tn->nametbl_lock); if (buf) - named_cluster_distribute(net, buf); + tipc_node_broadcast(net, buf); return publ; } @@ -709,7 +710,7 @@ int tipc_nametbl_withdraw(struct net *net, u32 type, u32 lower, u32 ref, spin_unlock_bh(&tn->nametbl_lock); if (skb) { - named_cluster_distribute(net, skb); + tipc_node_broadcast(net, skb); return 1; } return 0; |