diff options
| author | Allan Stephens <allan.stephens@windriver.com> | 2012-04-17 18:16:34 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2012-04-19 15:46:40 -0400 |
| commit | d4f5c12cdf43ce70731d5abfb6400bfb1be392d3 (patch) | |
| tree | 8ce57140f3bd5eb0a11937eb1f9f0640ce33549c /net | |
| parent | 336ebf5bf524e447227cb1d785b22ca722e6afa7 (diff) | |
| download | linux-3.10-d4f5c12cdf43ce70731d5abfb6400bfb1be392d3.tar.gz linux-3.10-d4f5c12cdf43ce70731d5abfb6400bfb1be392d3.tar.bz2 linux-3.10-d4f5c12cdf43ce70731d5abfb6400bfb1be392d3.zip | |
tipc: Ensure network address change doesn't impact name table updates
Revises routines that add and remove an entry from a node's name table
so that the publication scope lists are updated properly even if the
node's network address is changed in mid-operation. The routines now
recognize the default node address of <0.0.0> as an alias for "this node"
even after a new network address has been assigned.
Signed-off-by: Allan Stephens <allan.stephens@windriver.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/tipc/name_table.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/tipc/name_table.c b/net/tipc/name_table.c index 1e0518da19d..25c2975d86e 100644 --- a/net/tipc/name_table.c +++ b/net/tipc/name_table.c @@ -342,12 +342,12 @@ static struct publication *tipc_nameseq_insert_publ(struct name_seq *nseq, list_add(&publ->zone_list, &info->zone_list); info->zone_list_size++; - if (in_own_cluster_exact(node)) { + if (in_own_cluster(node)) { list_add(&publ->cluster_list, &info->cluster_list); info->cluster_list_size++; } - if (node == tipc_own_addr) { + if (in_own_node(node)) { list_add(&publ->node_list, &info->node_list); info->node_list_size++; } @@ -411,14 +411,14 @@ found: /* Remove publication from cluster scope list, if present */ - if (in_own_cluster_exact(node)) { + if (in_own_cluster(node)) { list_del(&publ->cluster_list); info->cluster_list_size--; } /* Remove publication from node scope list, if present */ - if (node == tipc_own_addr) { + if (in_own_node(node)) { list_del(&publ->node_list); info->node_list_size--; } |