tipc: reduce usage of context info in socket and link

[karo-tx-linux.git] / net / tipc / discover.c

diff --git a/net/tipc/discover.c b/net/tipc/discover.c
index f0fd8b449aef4d30233317ef2f5c4c9a16e90c33..feef3753615d24f9067f859fcf7b0476b2708775 100644 (file)
--- a/net/tipc/discover.c
+++ b/net/tipc/discover.c
@@ -1,7 +1,7 @@
 /*
  * net/tipc/discover.c
  *
- * Copyright (c) 2003-2006, 2014, Ericsson AB
+ * Copyright (c) 2003-2006, 2014-2015, Ericsson AB
  * Copyright (c) 2005-2006, 2010-2011, Wind River Systems
  * All rights reserved.
  *
@@ -47,10 +47,10 @@
 /* indicates no timer in use */
 #define TIPC_LINK_REQ_INACTIVE 0xffffffff
 
-
 /**
  * struct tipc_link_req - information about an ongoing link setup request
  * @bearer_id: identity of bearer issuing requests
+ * @net: network namespace instance
  * @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)
@@ -62,6 +62,7 @@
 struct tipc_link_req {
        u32 bearer_id;
        struct tipc_media_addr dest;
+       struct net *net;
        u32 domain;
        int num_nodes;
        spinlock_t lock;
@@ -84,9 +85,10 @@ static void tipc_disc_init_msg(struct net *net, struct sk_buff *buf, u32 type,
        u32 dest_domain = b_ptr->domain;
 
        msg = buf_msg(buf);
-       tipc_msg_init(msg, LINK_CONFIG, type, INT_H_SIZE, dest_domain);
+       tipc_msg_init(tn->own_addr, msg, LINK_CONFIG, type,
+                     INT_H_SIZE, dest_domain);
        msg_set_non_seq(msg, 1);
-       msg_set_node_sig(msg, tipc_random);
+       msg_set_node_sig(msg, tn->random);
        msg_set_dest_domain(msg, dest_domain);
        msg_set_bc_netid(msg, tn->net_id);
        b_ptr->media->addr2msg(msg_media_addr(msg), &b_ptr->addr);
@@ -151,23 +153,19 @@ void tipc_disc_rcv(struct net *net, struct sk_buff *buf,
        if (!tipc_addr_node_valid(onode))
                return;
 
-       if (in_own_node(onode)) {
+       if (in_own_node(net, onode)) {
                if (memcmp(&maddr, &bearer->addr, sizeof(maddr)))
-                       disc_dupl_alert(bearer, tipc_own_addr, &maddr);
+                       disc_dupl_alert(bearer, tn->own_addr, &maddr);
                return;
        }
-       if (!tipc_in_scope(ddom, tipc_own_addr))
+       if (!tipc_in_scope(ddom, tn->own_addr))
                return;
        if (!tipc_in_scope(bearer->domain, onode))
                return;
 
-       /* Locate, or if necessary, create, node: */
-       node = tipc_node_find(net, onode);
-       if (!node)
-               node = tipc_node_create(net, onode);
+       node = tipc_node_create(net, onode);
        if (!node)
                return;
-
        tipc_node_lock(node);
        link = node->links[bearer->identity];
 
@@ -254,7 +252,7 @@ void tipc_disc_rcv(struct net *net, struct sk_buff *buf,
                rbuf = tipc_buf_acquire(INT_H_SIZE);
                if (rbuf) {
                        tipc_disc_init_msg(net, rbuf, DSC_RESP_MSG, bearer);
-                       tipc_bearer_send(bearer->identity, rbuf, &maddr);
+                       tipc_bearer_send(net, bearer->identity, rbuf, &maddr);
                        kfree_skb(rbuf);
                }
        }
@@ -328,7 +326,7 @@ static void disc_timeout(unsigned long data)
         * hold at fast polling rate if don't have any associated nodes,
         * otherwise hold at slow polling rate
         */
-       tipc_bearer_send(req->bearer_id, req->buf, &req->dest);
+       tipc_bearer_send(req->net, req->bearer_id, req->buf, &req->dest);
 
 
        req->timer_intv *= 2;
@@ -370,6 +368,7 @@ int tipc_disc_create(struct net *net, struct tipc_bearer *b_ptr,
 
        tipc_disc_init_msg(net, req->buf, DSC_REQ_MSG, b_ptr);
        memcpy(&req->dest, dest, sizeof(*dest));
+       req->net = net;
        req->bearer_id = b_ptr->identity;
        req->domain = b_ptr->domain;
        req->num_nodes = 0;
@@ -378,7 +377,7 @@ int tipc_disc_create(struct net *net, struct tipc_bearer *b_ptr,
        setup_timer(&req->timer, disc_timeout, (unsigned long)req);
        mod_timer(&req->timer, jiffies + req->timer_intv);
        b_ptr->link_req = req;
-       tipc_bearer_send(req->bearer_id, req->buf, &req->dest);
+       tipc_bearer_send(net, req->bearer_id, req->buf, &req->dest);
        return 0;
 }
 
@@ -405,11 +404,12 @@ void tipc_disc_reset(struct net *net, struct tipc_bearer *b_ptr)
 
        spin_lock_bh(&req->lock);
        tipc_disc_init_msg(net, req->buf, DSC_REQ_MSG, b_ptr);
+       req->net = net;
        req->bearer_id = b_ptr->identity;
        req->domain = b_ptr->domain;
        req->num_nodes = 0;
        req->timer_intv = TIPC_LINK_REQ_INIT;
        mod_timer(&req->timer, jiffies + req->timer_intv);
-       tipc_bearer_send(req->bearer_id, req->buf, &req->dest);
+       tipc_bearer_send(net, req->bearer_id, req->buf, &req->dest);
        spin_unlock_bh(&req->lock);
 }