From: Kinsey Moore <kmoore@digium.com>
Date: Thu, 18 Aug 2011 19:29:15 +0000 (+0000)
Subject: Merged revisions 332503 via svnmerge from
X-Git-Tag: 10.0.0-beta2~117
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c33ad6fc7610dd9b10e2706cff37995c0430c348;p=thirdparty%2Fasterisk.git

Merged revisions 332503 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r332503 | kmoore | 2011-08-18 14:28:00 -0500 (Thu, 18 Aug 2011) | 8 lines

  CRC4 in "dahdi show status" gives wrong impression to T1 users

  Change CRC4 to CRC in the output of "dahdi show status" so that it can apply in
  more situations without confusing users, especially since T1 lines use CRC6
  instead of CRC4.

  (closes issue AST-471)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/10@332504 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index 6fe89ba660..450f9debb0 100644
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
@@ -15477,7 +15477,7 @@ static char *dahdi_show_status(struct ast_cli_entry *e, int cmd, struct ast_cli_
 		ast_cli(a->fd, "No DAHDI found. Unable to open /dev/dahdi/ctl: %s\n", strerror(errno));
 		return CLI_FAILURE;
 	}
-	ast_cli(a->fd, FORMAT2, "Description", "Alarms", "IRQ", "bpviol", "CRC4", "Framing", "Coding", "Options", "LBO");
+	ast_cli(a->fd, FORMAT2, "Description", "Alarms", "IRQ", "bpviol", "CRC", "Framing", "Coding", "Options", "LBO");
 
 	for (span = 1; span < DAHDI_MAX_SPANS; ++span) {
 		s.spanno = span;