From: Randy Dunlap <randy.dunlap@oracle.com>

Correct the token-ring sysctl procname.

Eric said: "token-ring" is the historical name we have used in /proc/sys
despite it being abbreviated tr in the kernel.  So this fix is definitely
correct.

Reported by: Daniel Exner <dex@dragonslave.de>:
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Acked-by: Eric W. Biederman <ebiederm@xmission.com>
Cc: "David S. Miller" <davem@davemloft.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 kernel/sysctl_check.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff -puN kernel/sysctl_check.c~sysctl-fix-token-ring-procname kernel/sysctl_check.c
--- a/kernel/sysctl_check.c~sysctl-fix-token-ring-procname
+++ a/kernel/sysctl_check.c
@@ -738,7 +738,7 @@ static struct trans_ctl_table trans_net_
 	{ NET_ROSE,		"rose",		trans_net_rose_table },
 	{ NET_IPV6,		"ipv6",		trans_net_ipv6_table },
 	{ NET_X25,		"x25",		trans_net_x25_table },
-	{ NET_TR,		"tr",		trans_net_tr_table },
+	{ NET_TR,		"token-ring",	trans_net_tr_table },
 	{ NET_DECNET,		"decnet",	trans_net_decnet_table },
 	/*  NET_ECONET not used */
 	{ NET_SCTP,		"sctp",		trans_net_sctp_table },
_