Index: include/dahdi/user.h
===================================================================
--- include/dahdi/user.h	(revision 6649)
+++ include/dahdi/user.h	(working copy)
@@ -723,9 +723,9 @@
  * Get/Set dialing parameters
  */
 struct dahdi_dialparams {
-	int mfv1_tonelen;	/* MF R1 tone length for digits */
-	int dtmf_tonelen;	/* DTMF tone length */
-	int mfr2_tonelen;	/* MF R2 tone length */
+	int mfv1_tonelen;	/* MF R1 tone length for digits, milliseconds */
+	int dtmf_tonelen;	/* DTMF tone length, milliseconds */
+	int mfr2_tonelen;	/* MF R2 tone length, milliseconds */
 	int reserved[3];	/* Reserved for future expansion -- always set to 0 */
 };
 
Index: drivers/dahdi/dahdi-base.c
===================================================================
--- drivers/dahdi/dahdi-base.c	(revision 6649)
+++ drivers/dahdi/dahdi-base.c	(working copy)
@@ -2974,7 +2974,7 @@
 				z->tones[td.tone] = t;
 			break;
 		case DTMF_TONE:
-			t->tonesamples = global_dialparams.dtmf_tonelen;
+			t->tonesamples = global_dialparams.dtmf_tonelen * DAHDI_CHUNKSIZE;
 			t->next = &dtmf_silence;
 			z->dtmf_continuous[td.tone] = *t;
 			z->dtmf_continuous[td.tone].next = &z->dtmf_continuous[td.tone];
@@ -2990,19 +2990,19 @@
 				t->tonesamples = 100 * DAHDI_CHUNKSIZE;
 				break;
 			default:
-				t->tonesamples = global_dialparams.mfv1_tonelen;
+				t->tonesamples = global_dialparams.mfv1_tonelen * DAHDI_CHUNKSIZE;
 				break;
 			}
 			t->next = &mfr1_silence;
 			break;
 		case MFR2_FWD_TONE:
-			t->tonesamples = global_dialparams.mfr2_tonelen;
+			t->tonesamples = global_dialparams.mfr2_tonelen * DAHDI_CHUNKSIZE;
 			t->next = &dtmf_silence;
 			z->mfr2_fwd_continuous[td.tone] = *t;
 			z->mfr2_fwd_continuous[td.tone].next = &z->mfr2_fwd_continuous[td.tone];
 			break;
 		case MFR2_REV_TONE:
-			t->tonesamples = global_dialparams.mfr2_tonelen;
+			t->tonesamples = global_dialparams.mfr2_tonelen * DAHDI_CHUNKSIZE;
 			t->next = &dtmf_silence;
 			z->mfr2_rev_continuous[td.tone] = *t;
 			z->mfr2_rev_continuous[td.tone].next = &z->mfr2_rev_continuous[td.tone];
Index: drivers/dahdi/digits.h
===================================================================
--- drivers/dahdi/digits.h	(revision 6649)
+++ drivers/dahdi/digits.h	(working copy)
@@ -19,29 +19,29 @@
 #ifndef _DIGITS_H
 #define _DIGITS_H
 
-#define DEFAULT_DTMF_LENGTH	100 * DAHDI_CHUNKSIZE
-#define DEFAULT_MFR1_LENGTH	68 * DAHDI_CHUNKSIZE
-#define DEFAULT_MFR2_LENGTH	100 * DAHDI_CHUNKSIZE
-#define	PAUSE_LENGTH		500 * DAHDI_CHUNKSIZE
+#define DEFAULT_DTMF_LENGTH	100
+#define DEFAULT_MFR1_LENGTH	68
+#define DEFAULT_MFR2_LENGTH	100
+#define	PAUSE_LENGTH		500
 
 /* At the end of silence, the tone stops */
 static struct dahdi_tone dtmf_silence = {
-	.tonesamples = DEFAULT_DTMF_LENGTH,
+	.tonesamples = DEFAULT_DTMF_LENGTH * DAHDI_CHUNKSIZE,
 };
 
 /* At the end of silence, the tone stops */
 static struct dahdi_tone mfr1_silence = {
-	.tonesamples = DEFAULT_MFR1_LENGTH,
+	.tonesamples = DEFAULT_MFR1_LENGTH * DAHDI_CHUNKSIZE,
 };
 
 /* At the end of silence, the tone stops */
 static struct dahdi_tone mfr2_silence = {
-	.tonesamples = DEFAULT_MFR2_LENGTH,
+	.tonesamples = DEFAULT_MFR2_LENGTH * DAHDI_CHUNKSIZE,
 };
 
 /* A pause in the dialing */
 static struct dahdi_tone tone_pause = {
-	.tonesamples = PAUSE_LENGTH,
+	.tonesamples = PAUSE_LENGTH * DAHDI_CHUNKSIZE,
 };
 
 #endif