diff options
| author | Erik Hugne <erik.hugne@ericsson.com> | 2014-03-28 10:32:09 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-03-28 14:46:29 -0400 |
| commit | 16470111ed2aad67d2e2407aae2a8a53a4a38060 (patch) | |
| tree | 09049ec1857214f78c7bee8040eef6e66c0a971e /net/tipc/bearer.c | |
| parent | a21a584d6720ce349b05795b9bcfab3de8e58419 (diff) | |
| download | linux-16470111ed2aad67d2e2407aae2a8a53a4a38060.tar.bz2 | |
tipc: make discovery domain a bearer attribute
The node discovery domain is assigned when a bearer is enabled.
In the previous commit we reflect this attribute directly in the
bearer structure since it's needed to reinitialize the node
discovery mechanism after a hardware address change.
There's no need to replicate this attribute anywhere else, so we
remove it from the tipc_link_req structure.
Signed-off-by: Erik Hugne <erik.hugne@ericsson.com>
Reviewed-by: Ying Xue <ying.xue@windriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc/bearer.c')
| -rw-r--r-- | net/tipc/bearer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/tipc/bearer.c b/net/tipc/bearer.c index 3cd65d46b173..3fef7eb776dc 100644 --- a/net/tipc/bearer.c +++ b/net/tipc/bearer.c @@ -336,7 +336,7 @@ restart: b_ptr->net_plane = bearer_id + 'A'; b_ptr->priority = priority; - res = tipc_disc_create(b_ptr, &b_ptr->bcast_addr, disc_domain); + res = tipc_disc_create(b_ptr, &b_ptr->bcast_addr); if (res) { bearer_disable(b_ptr, false); pr_warn("Bearer <%s> rejected, discovery object creation failed\n", @@ -363,7 +363,7 @@ static int tipc_reset_bearer(struct tipc_bearer *b_ptr) pr_info("Resetting bearer <%s>\n", b_ptr->name); tipc_disc_delete(b_ptr->link_req); tipc_link_reset_list(b_ptr->identity); - tipc_disc_create(b_ptr, &b_ptr->bcast_addr, b_ptr->domain); + tipc_disc_create(b_ptr, &b_ptr->bcast_addr); read_unlock_bh(&tipc_net_lock); return 0; } |