Commit 16470111 authored by Erik Hugne's avatar Erik Hugne Committed by David S. Miller
Browse files

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: default avatarErik Hugne <erik.hugne@ericsson.com>
Reviewed-by: Ying Xue's avatarYing Xue <ying.xue@windriver.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a21a584d
...@@ -336,7 +336,7 @@ restart: ...@@ -336,7 +336,7 @@ restart:
b_ptr->net_plane = bearer_id + 'A'; b_ptr->net_plane = bearer_id + 'A';
b_ptr->priority = priority; 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) { if (res) {
bearer_disable(b_ptr, false); bearer_disable(b_ptr, false);
pr_warn("Bearer <%s> rejected, discovery object creation failed\n", pr_warn("Bearer <%s> rejected, discovery object creation failed\n",
...@@ -363,7 +363,7 @@ static int tipc_reset_bearer(struct tipc_bearer *b_ptr) ...@@ -363,7 +363,7 @@ static int tipc_reset_bearer(struct tipc_bearer *b_ptr)
pr_info("Resetting bearer <%s>\n", b_ptr->name); pr_info("Resetting bearer <%s>\n", b_ptr->name);
tipc_disc_delete(b_ptr->link_req); tipc_disc_delete(b_ptr->link_req);
tipc_link_reset_list(b_ptr->identity); 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); read_unlock_bh(&tipc_net_lock);
return 0; return 0;
} }
......
...@@ -48,7 +48,6 @@ ...@@ -48,7 +48,6 @@
* struct tipc_link_req - information about an ongoing link setup request * struct tipc_link_req - information about an ongoing link setup request
* @bearer: bearer issuing requests * @bearer: bearer issuing requests
* @dest: destination address for request messages * @dest: destination address for request messages
* @domain: network domain to which links can be established
* @num_nodes: number of nodes currently discovered (i.e. with an active link) * @num_nodes: number of nodes currently discovered (i.e. with an active link)
* @lock: spinlock for controlling access to requests * @lock: spinlock for controlling access to requests
* @buf: request message to be (repeatedly) sent * @buf: request message to be (repeatedly) sent
...@@ -58,7 +57,6 @@ ...@@ -58,7 +57,6 @@
struct tipc_link_req { struct tipc_link_req {
struct tipc_bearer *bearer; struct tipc_bearer *bearer;
struct tipc_media_addr dest; struct tipc_media_addr dest;
u32 domain;
int num_nodes; int num_nodes;
spinlock_t lock; spinlock_t lock;
struct sk_buff *buf; struct sk_buff *buf;
...@@ -69,14 +67,13 @@ struct tipc_link_req { ...@@ -69,14 +67,13 @@ struct tipc_link_req {
/** /**
* tipc_disc_init_msg - initialize a link setup message * tipc_disc_init_msg - initialize a link setup message
* @type: message type (request or response) * @type: message type (request or response)
* @dest_domain: network domain of node(s) which should respond to message
* @b_ptr: ptr to bearer issuing message * @b_ptr: ptr to bearer issuing message
*/ */
static struct sk_buff *tipc_disc_init_msg(u32 type, u32 dest_domain, static struct sk_buff *tipc_disc_init_msg(u32 type, struct tipc_bearer *b_ptr)
struct tipc_bearer *b_ptr)
{ {
struct sk_buff *buf = tipc_buf_acquire(INT_H_SIZE); struct sk_buff *buf = tipc_buf_acquire(INT_H_SIZE);
struct tipc_msg *msg; struct tipc_msg *msg;
u32 dest_domain = b_ptr->domain;
if (buf) { if (buf) {
msg = buf_msg(buf); msg = buf_msg(buf);
...@@ -149,7 +146,7 @@ void tipc_disc_rcv(struct sk_buff *buf, struct tipc_bearer *b_ptr) ...@@ -149,7 +146,7 @@ void tipc_disc_rcv(struct sk_buff *buf, struct tipc_bearer *b_ptr)
} }
if (!tipc_in_scope(dest, tipc_own_addr)) if (!tipc_in_scope(dest, tipc_own_addr))
return; return;
if (!tipc_in_scope(b_ptr->link_req->domain, orig)) if (!tipc_in_scope(b_ptr->domain, orig))
return; return;
/* Locate structure corresponding to requesting node */ /* Locate structure corresponding to requesting node */
...@@ -242,7 +239,7 @@ void tipc_disc_rcv(struct sk_buff *buf, struct tipc_bearer *b_ptr) ...@@ -242,7 +239,7 @@ void tipc_disc_rcv(struct sk_buff *buf, struct tipc_bearer *b_ptr)
link_fully_up = link_working_working(link); link_fully_up = link_working_working(link);
if ((type == DSC_REQ_MSG) && !link_fully_up) { if ((type == DSC_REQ_MSG) && !link_fully_up) {
rbuf = tipc_disc_init_msg(DSC_RESP_MSG, orig, b_ptr); rbuf = tipc_disc_init_msg(DSC_RESP_MSG, b_ptr);
if (rbuf) { if (rbuf) {
tipc_bearer_send(b_ptr, rbuf, &media_addr); tipc_bearer_send(b_ptr, rbuf, &media_addr);
kfree_skb(rbuf); kfree_skb(rbuf);
...@@ -306,7 +303,7 @@ static void disc_timeout(struct tipc_link_req *req) ...@@ -306,7 +303,7 @@ static void disc_timeout(struct tipc_link_req *req)
spin_lock_bh(&req->lock); spin_lock_bh(&req->lock);
/* Stop searching if only desired node has been found */ /* Stop searching if only desired node has been found */
if (tipc_node(req->domain) && req->num_nodes) { if (tipc_node(req->bearer->domain) && req->num_nodes) {
req->timer_intv = TIPC_LINK_REQ_INACTIVE; req->timer_intv = TIPC_LINK_REQ_INACTIVE;
goto exit; goto exit;
} }
...@@ -342,8 +339,7 @@ exit: ...@@ -342,8 +339,7 @@ exit:
* *
* Returns 0 if successful, otherwise -errno. * Returns 0 if successful, otherwise -errno.
*/ */
int tipc_disc_create(struct tipc_bearer *b_ptr, struct tipc_media_addr *dest, int tipc_disc_create(struct tipc_bearer *b_ptr, struct tipc_media_addr *dest)
u32 dest_domain)
{ {
struct tipc_link_req *req; struct tipc_link_req *req;
...@@ -351,7 +347,7 @@ int tipc_disc_create(struct tipc_bearer *b_ptr, struct tipc_media_addr *dest, ...@@ -351,7 +347,7 @@ int tipc_disc_create(struct tipc_bearer *b_ptr, struct tipc_media_addr *dest,
if (!req) if (!req)
return -ENOMEM; return -ENOMEM;
req->buf = tipc_disc_init_msg(DSC_REQ_MSG, dest_domain, b_ptr); req->buf = tipc_disc_init_msg(DSC_REQ_MSG, b_ptr);
if (!req->buf) { if (!req->buf) {
kfree(req); kfree(req);
return -ENOMSG; return -ENOMSG;
...@@ -359,7 +355,6 @@ int tipc_disc_create(struct tipc_bearer *b_ptr, struct tipc_media_addr *dest, ...@@ -359,7 +355,6 @@ int tipc_disc_create(struct tipc_bearer *b_ptr, struct tipc_media_addr *dest,
memcpy(&req->dest, dest, sizeof(*dest)); memcpy(&req->dest, dest, sizeof(*dest));
req->bearer = b_ptr; req->bearer = b_ptr;
req->domain = dest_domain;
req->num_nodes = 0; req->num_nodes = 0;
req->timer_intv = TIPC_LINK_REQ_INIT; req->timer_intv = TIPC_LINK_REQ_INIT;
spin_lock_init(&req->lock); spin_lock_init(&req->lock);
......
...@@ -39,8 +39,7 @@ ...@@ -39,8 +39,7 @@
struct tipc_link_req; struct tipc_link_req;
int tipc_disc_create(struct tipc_bearer *b_ptr, struct tipc_media_addr *dest, int tipc_disc_create(struct tipc_bearer *b_ptr, struct tipc_media_addr *dest);
u32 dest_domain);
void tipc_disc_delete(struct tipc_link_req *req); void tipc_disc_delete(struct tipc_link_req *req);
void tipc_disc_add_dest(struct tipc_link_req *req); void tipc_disc_add_dest(struct tipc_link_req *req);
void tipc_disc_remove_dest(struct tipc_link_req *req); void tipc_disc_remove_dest(struct tipc_link_req *req);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment