aboutsummaryrefslogtreecommitdiffstats
path: root/net/tipc/bearer.c
diff options
context:
space:
mode:
authorPaul Gortmaker <paul.gortmaker@windriver.com>2011-12-29 21:39:49 -0500
committerPaul Gortmaker <paul.gortmaker@windriver.com>2011-12-29 21:53:30 -0500
commitf19765f4f7dc3cb118cf5f151ed56e01063082ed (patch)
treeb92015df8dedb940c6b6b99fe97ea35c19949221 /net/tipc/bearer.c
parenta18c4bc3ea3c23f658655b1eee4f62cb71d51efd (diff)
tipc: rename struct bearer_name to struct tipc_bearer_names
The addition of the "s" to indicate pluralization is intentional, since the struct actually contains two name variants. Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Diffstat (limited to 'net/tipc/bearer.c')
-rw-r--r--net/tipc/bearer.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/net/tipc/bearer.c b/net/tipc/bearer.c
index eab4201d4312..329fb659fae4 100644
--- a/net/tipc/bearer.c
+++ b/net/tipc/bearer.c
@@ -185,7 +185,7 @@ struct sk_buff *tipc_media_get_names(void)
185 */ 185 */
186 186
187static int bearer_name_validate(const char *name, 187static int bearer_name_validate(const char *name,
188 struct bearer_name *name_parts) 188 struct tipc_bearer_names *name_parts)
189{ 189{
190 char name_copy[TIPC_MAX_BEARER_NAME]; 190 char name_copy[TIPC_MAX_BEARER_NAME];
191 char *media_name; 191 char *media_name;
@@ -428,7 +428,7 @@ int tipc_enable_bearer(const char *name, u32 disc_domain, u32 priority)
428{ 428{
429 struct tipc_bearer *b_ptr; 429 struct tipc_bearer *b_ptr;
430 struct tipc_media *m_ptr; 430 struct tipc_media *m_ptr;
431 struct bearer_name b_name; 431 struct tipc_bearer_names b_names;
432 char addr_string[16]; 432 char addr_string[16];
433 u32 bearer_id; 433 u32 bearer_id;
434 u32 with_this_prio; 434 u32 with_this_prio;
@@ -440,7 +440,7 @@ int tipc_enable_bearer(const char *name, u32 disc_domain, u32 priority)
440 name); 440 name);
441 return -ENOPROTOOPT; 441 return -ENOPROTOOPT;
442 } 442 }
443 if (!bearer_name_validate(name, &b_name)) { 443 if (!bearer_name_validate(name, &b_names)) {
444 warn("Bearer <%s> rejected, illegal name\n", name); 444 warn("Bearer <%s> rejected, illegal name\n", name);
445 return -EINVAL; 445 return -EINVAL;
446 } 446 }
@@ -465,10 +465,10 @@ int tipc_enable_bearer(const char *name, u32 disc_domain, u32 priority)
465 465
466 write_lock_bh(&tipc_net_lock); 466 write_lock_bh(&tipc_net_lock);
467 467
468 m_ptr = tipc_media_find(b_name.media_name); 468 m_ptr = tipc_media_find(b_names.media_name);
469 if (!m_ptr) { 469 if (!m_ptr) {
470 warn("Bearer <%s> rejected, media <%s> not registered\n", name, 470 warn("Bearer <%s> rejected, media <%s> not registered\n", name,
471 b_name.media_name); 471 b_names.media_name);
472 goto exit; 472 goto exit;
473 } 473 }
474 474