mISDN: DSP scheduling fix (version 2)

dsp_spl_jiffies need to be the same datatype as jiffies (which is ulong).
If not, on 64 bit systems it will fallback to schedule the DSP every jiffie
tic as soon jiffies become > 2^32.

Signed-off-by: Karsten Keil <kkeil@linux-pingi.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/isdn/mISDN/dsp.h b/drivers/isdn/mISDN/dsp.h
index afe4173ae00770524eb5a3faf59d1eb98b4c0486..fc1733a088459e2ae27479ca75f6e343ac4b3a0b 100644 (file)
--- a/drivers/isdn/mISDN/dsp.h
+++ b/drivers/isdn/mISDN/dsp.h
@@ -76,7 +76,9 @@ extern u8 dsp_silence;
 #define MAX_SECONDS_JITTER_CHECK 5
 
 extern struct timer_list dsp_spl_tl;
-extern u32 dsp_spl_jiffies;
+
+/* the datatype need to match jiffies datatype */
+extern unsigned long dsp_spl_jiffies;
 
 /* the structure of conferences:
  *

diff --git a/drivers/isdn/mISDN/dsp_cmx.c b/drivers/isdn/mISDN/dsp_cmx.c
index 0c104b97683592f0f66b69faa67c8e62b8d50322..a4f05c54c32b021cc04fb9ea65ece506a1e94e2a 100644 (file)
--- a/drivers/isdn/mISDN/dsp_cmx.c
+++ b/drivers/isdn/mISDN/dsp_cmx.c
@@ -1624,7 +1624,7 @@ send_packet:
 
 static u32     jittercount; /* counter for jitter check */
 struct timer_list dsp_spl_tl;
-u32    dsp_spl_jiffies; /* calculate the next time to fire */
+unsigned long  dsp_spl_jiffies; /* calculate the next time to fire */
 static u16     dsp_count; /* last sample count */
 static int     dsp_count_valid; /* if we have last sample count */