summaryrefslogtreecommitdiff
path: root/net/tipc/port.h
diff options
context:
space:
mode:
authorJon Paul Maloy <jon.maloy@ericsson.com>2014-08-22 18:09:15 -0400
committerDavid S. Miller <davem@davemloft.net>2014-08-23 11:18:34 -0700
commit9b50fd087a9f1454d6a8b613fff376dfb6d6ea93 (patch)
treeaa33132baefa002ee81a2cd2603ed7891ee0eecd /net/tipc/port.h
parent5a9ee0be3371eb77d671a77e26261931c5c3fb31 (diff)
downloadlinux-rt-9b50fd087a9f1454d6a8b613fff376dfb6d6ea93.tar.gz
tipc: replace port pointer with socket pointer in registry
In order to make tipc_sock the only entity referencable from other parts of the stack, we add a tipc_sock pointer instead of a tipc_port pointer to the registry. As a consequence, we also let the function tipc_port_lock() return a pointer to a tipc_sock instead of a tipc_port. We keep the function's name for now, since the lock still is owned by the port. This is another step in the direction of eliminating port_lock, replacing its usage with lock_sock() and bh_lock_sock(). Signed-off-by: Jon Maloy <jon.maloy@ericsson.com> Reviewed-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/port.h')
-rw-r--r--net/tipc/port.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/tipc/port.h b/net/tipc/port.h
index 4a3c54e5d69c..33e52fe50e10 100644
--- a/net/tipc/port.h
+++ b/net/tipc/port.h
@@ -101,9 +101,9 @@ void tipc_port_reinit(void);
/**
* tipc_port_lock - lock port instance referred to and return its pointer
*/
-static inline struct tipc_port *tipc_port_lock(u32 ref)
+static inline struct tipc_sock *tipc_port_lock(u32 ref)
{
- return (struct tipc_port *)tipc_ref_lock(ref);
+ return (struct tipc_sock *)tipc_ref_lock(ref);
}
/**