aboutsummaryrefslogtreecommitdiffstats
path: root/net/tipc
diff options
context:
space:
mode:
authorYing Xue <ying.xue@windriver.com>2013-06-17 10:54:44 -0400
committerDavid S. Miller <davem@davemloft.net>2013-06-17 18:53:01 -0400
commit3c5db8e4eca36e4f312b49bba99f4c1f6ce0563a (patch)
treefb643984e5e69ac6adcb272bece27b56a7622fe2 /net/tipc
parentf1733d7580ff94deb8ea071a293c23939ae0d450 (diff)
tipc: rename tipc_createport_raw to tipc_createport
After the removal of the native API, there is now only one way to to create a TIPC port instance -- the function tipc_createport_raw(). We make it more readable by renaming it to tipc_createport(). Signed-off-by: Ying Xue <ying.xue@windriver.com> Signed-off-by: Jon Maloy <jon.maloy@ericsson.com> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc')
-rw-r--r--net/tipc/port.c4
-rw-r--r--net/tipc/port.h2
-rw-r--r--net/tipc/socket.c4
3 files changed, 5 insertions, 5 deletions
diff --git a/net/tipc/port.c b/net/tipc/port.c
index f628c84a8f61..84b2a574f161 100644
--- a/net/tipc/port.c
+++ b/net/tipc/port.c
@@ -202,11 +202,11 @@ exit:
202} 202}
203 203
204/** 204/**
205 * tipc_createport_raw - create a generic TIPC port 205 * tipc_createport - create a generic TIPC port
206 * 206 *
207 * Returns pointer to (locked) TIPC port, or NULL if unable to create it 207 * Returns pointer to (locked) TIPC port, or NULL if unable to create it
208 */ 208 */
209struct tipc_port *tipc_createport_raw(void *usr_handle, 209struct tipc_port *tipc_createport(void *usr_handle,
210 u32 (*dispatcher)(struct tipc_port *, struct sk_buff *), 210 u32 (*dispatcher)(struct tipc_port *, struct sk_buff *),
211 void (*wakeup)(struct tipc_port *), 211 void (*wakeup)(struct tipc_port *),
212 const u32 importance) 212 const u32 importance)
diff --git a/net/tipc/port.h b/net/tipc/port.h
index 4779f0a82234..45838826f2f8 100644
--- a/net/tipc/port.h
+++ b/net/tipc/port.h
@@ -106,7 +106,7 @@ struct tipc_port_list;
106/* 106/*
107 * TIPC port manipulation routines 107 * TIPC port manipulation routines
108 */ 108 */
109struct tipc_port *tipc_createport_raw(void *usr_handle, 109struct tipc_port *tipc_createport(void *usr_handle,
110 u32 (*dispatcher)(struct tipc_port *, struct sk_buff *), 110 u32 (*dispatcher)(struct tipc_port *, struct sk_buff *),
111 void (*wakeup)(struct tipc_port *), const u32 importance); 111 void (*wakeup)(struct tipc_port *), const u32 importance);
112 112
diff --git a/net/tipc/socket.c b/net/tipc/socket.c
index 9510fe8acf45..67f4e1fbf5a1 100644
--- a/net/tipc/socket.c
+++ b/net/tipc/socket.c
@@ -195,8 +195,8 @@ static int tipc_sk_create(struct net *net, struct socket *sock, int protocol,
195 return -ENOMEM; 195 return -ENOMEM;
196 196
197 /* Allocate TIPC port for socket to use */ 197 /* Allocate TIPC port for socket to use */
198 tp_ptr = tipc_createport_raw(sk, &dispatch, &wakeupdispatch, 198 tp_ptr = tipc_createport(sk, &dispatch, &wakeupdispatch,
199 TIPC_LOW_IMPORTANCE); 199 TIPC_LOW_IMPORTANCE);
200 if (unlikely(!tp_ptr)) { 200 if (unlikely(!tp_ptr)) {
201 sk_free(sk); 201 sk_free(sk);
202 return -ENOMEM; 202 return -ENOMEM;