aboutsummaryrefslogtreecommitdiffstats
path: root/net/tipc/node.h
diff options
context:
space:
mode:
Diffstat (limited to 'net/tipc/node.h')
-rw-r--r--net/tipc/node.h10
1 files changed, 3 insertions, 7 deletions
diff --git a/net/tipc/node.h b/net/tipc/node.h
index 8784907486c0..651a1581a210 100644
--- a/net/tipc/node.h
+++ b/net/tipc/node.h
@@ -109,7 +109,7 @@ struct tipc_bclink_entry {
109struct tipc_node { 109struct tipc_node {
110 u32 addr; 110 u32 addr;
111 struct kref kref; 111 struct kref kref;
112 spinlock_t lock; 112 rwlock_t lock;
113 struct net *net; 113 struct net *net;
114 struct hlist_node hash; 114 struct hlist_node hash;
115 int active_links[2]; 115 int active_links[2];
@@ -145,7 +145,8 @@ void tipc_node_detach_link(struct tipc_node *n_ptr, struct tipc_link *l_ptr);
145bool tipc_node_is_up(struct tipc_node *n); 145bool tipc_node_is_up(struct tipc_node *n);
146int tipc_node_get_linkname(struct net *net, u32 bearer_id, u32 node, 146int tipc_node_get_linkname(struct net *net, u32 bearer_id, u32 node,
147 char *linkname, size_t len); 147 char *linkname, size_t len);
148void tipc_node_unlock(struct tipc_node *node); 148void tipc_node_read_lock(struct tipc_node *n);
149void tipc_node_read_unlock(struct tipc_node *node);
149int tipc_node_xmit(struct net *net, struct sk_buff_head *list, u32 dnode, 150int tipc_node_xmit(struct net *net, struct sk_buff_head *list, u32 dnode,
150 int selector); 151 int selector);
151int tipc_node_xmit_skb(struct net *net, struct sk_buff *skb, u32 dest, 152int tipc_node_xmit_skb(struct net *net, struct sk_buff *skb, u32 dest,
@@ -157,11 +158,6 @@ int tipc_node_add_conn(struct net *net, u32 dnode, u32 port, u32 peer_port);
157void tipc_node_remove_conn(struct net *net, u32 dnode, u32 port); 158void tipc_node_remove_conn(struct net *net, u32 dnode, u32 port);
158int tipc_nl_node_dump(struct sk_buff *skb, struct netlink_callback *cb); 159int tipc_nl_node_dump(struct sk_buff *skb, struct netlink_callback *cb);
159 160
160static inline void tipc_node_lock(struct tipc_node *node)
161{
162 spin_lock_bh(&node->lock);
163}
164
165static inline struct tipc_link *node_active_link(struct tipc_node *n, int sel) 161static inline struct tipc_link *node_active_link(struct tipc_node *n, int sel)
166{ 162{
167 int bearer_id = n->active_links[sel & 1]; 163 int bearer_id = n->active_links[sel & 1];