From 69618c9515211e557f712b9d3b9a90b82666c53b Mon Sep 17 00:00:00 2001
From: Ying Xue <ying.xue@windriver.com>
Date: Thu, 16 Aug 2012 12:09:08 +0000
Subject: [PATCH] --- yaml --- r: 327548 b: refs/heads/master c:
 fc0739385ba10f59105e87a46cc93d9d9a10553c h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/net/tipc/bearer.c | 6 ++----
 trunk/net/tipc/core.c   | 3 ---
 trunk/net/tipc/core.h   | 2 --
 trunk/net/tipc/link.c   | 4 +---
 5 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index 89316adfbbe2..ce59ded12b7b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4225a398c1352a7a5c14dc07277cb5cc4473983b
+refs/heads/master: fc0739385ba10f59105e87a46cc93d9d9a10553c
diff --git a/trunk/net/tipc/bearer.c b/trunk/net/tipc/bearer.c
index 09e71241265d..6b2faa57a394 100644
--- a/trunk/net/tipc/bearer.c
+++ b/trunk/net/tipc/bearer.c
@@ -60,7 +60,7 @@ static int media_name_valid(const char *name)
 	len = strlen(name);
 	if ((len + 1) > TIPC_MAX_MEDIA_NAME)
 		return 0;
-	return strspn(name, tipc_alphabet) == len;
+	return 1;
 }
 
 /**
@@ -206,9 +206,7 @@ static int bearer_name_validate(const char *name,
 
 	/* validate component parts of bearer name */
 	if ((media_len <= 1) || (media_len > TIPC_MAX_MEDIA_NAME) ||
-	    (if_len <= 1) || (if_len > TIPC_MAX_IF_NAME) ||
-	    (strspn(media_name, tipc_alphabet) != (media_len - 1)) ||
-	    (strspn(if_name, tipc_alphabet) != (if_len - 1)))
+	    (if_len <= 1) || (if_len > TIPC_MAX_IF_NAME))
 		return 0;
 
 	/* return bearer name components, if necessary */
diff --git a/trunk/net/tipc/core.c b/trunk/net/tipc/core.c
index 6586eac6a50e..c261a5dca7c5 100644
--- a/trunk/net/tipc/core.c
+++ b/trunk/net/tipc/core.c
@@ -50,9 +50,6 @@
 /* global variables used by multiple sub-systems within TIPC */
 int tipc_random;
 
-const char tipc_alphabet[] =
-	"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_.";
-
 /* configurable TIPC parameters */
 u32 tipc_own_addr;
 int tipc_max_ports;
diff --git a/trunk/net/tipc/core.h b/trunk/net/tipc/core.h
index fd42e106c185..e4e46cd2d0e6 100644
--- a/trunk/net/tipc/core.h
+++ b/trunk/net/tipc/core.h
@@ -85,8 +85,6 @@ extern int tipc_remote_management;
  * Other global variables
  */
 extern int tipc_random;
-extern const char tipc_alphabet[];
-
 
 /*
  * Routines available to privileged subsystems
diff --git a/trunk/net/tipc/link.c b/trunk/net/tipc/link.c
index 1c1e6151875e..a79c755cb417 100644
--- a/trunk/net/tipc/link.c
+++ b/trunk/net/tipc/link.c
@@ -210,9 +210,7 @@ static int link_name_validate(const char *name,
 	    (z_local > 255) || (c_local > 4095) || (n_local > 4095) ||
 	    (z_peer  > 255) || (c_peer  > 4095) || (n_peer  > 4095) ||
 	    (if_local_len <= 1) || (if_local_len > TIPC_MAX_IF_NAME) ||
-	    (if_peer_len  <= 1) || (if_peer_len  > TIPC_MAX_IF_NAME) ||
-	    (strspn(if_local, tipc_alphabet) != (if_local_len - 1)) ||
-	    (strspn(if_peer, tipc_alphabet) != (if_peer_len - 1)))
+	    (if_peer_len  <= 1) || (if_peer_len  > TIPC_MAX_IF_NAME))
 		return 0;
 
 	/* return link name components, if necessary */