[svn-commits] kmoore: trunk r332505 - in /trunk: ./ channels/chan_dahdi.c

[SVN commits to the Digium repositories]

Author: kmoore
Date: Thu Aug 18 14:30:04 2011
New Revision: 332505

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=332505
Log:
Merged revisions 332504 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r332504 | kmoore | 2011-08-18 14:29:15 -0500 (Thu, 18 Aug 2011) | 15 lines
  
  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)
  ........
................

Modified:
    trunk/   (props changed)
    trunk/channels/chan_dahdi.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-10-merged' - no diff available.

Modified: trunk/channels/chan_dahdi.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_dahdi.c?view=diff&rev=332505&r1=332504&r2=332505
==============================================================================
--- trunk/channels/chan_dahdi.c (original)
+++ trunk/channels/chan_dahdi.c Thu Aug 18 14:30:04 2011
@@ -15477,7 +15477,7 @@
 		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;