[dahdi-commits] kpfleming: branch linux/kpfleming/echocan_work r6423 - /linux/team/kpfleming/...

[SVN commits to the DAHDI project]

Author: kpfleming
Date: Tue Apr 21 11:36:18 2009
New Revision: 6423

URL: http://svn.digium.com/svn-view/dahdi?view=rev&rev=6423
Log:
commit some fixes for problems found building with CONFIG_PPP enabled

move all conditional logic after inclusion of dahdi/kernel.h where the definitions of the conditions are stored


Modified:
    linux/team/kpfleming/echocan_work/drivers/dahdi/dahdi-base.c

Modified: linux/team/kpfleming/echocan_work/drivers/dahdi/dahdi-base.c
URL: http://svn.digium.com/svn-view/dahdi/linux/team/kpfleming/echocan_work/drivers/dahdi/dahdi-base.c?view=diff&rev=6423&r1=6422&r2=6423
==============================================================================
--- linux/team/kpfleming/echocan_work/drivers/dahdi/dahdi-base.c (original)
+++ linux/team/kpfleming/echocan_work/drivers/dahdi/dahdi-base.c Tue Apr 21 11:36:18 2009
@@ -47,24 +47,11 @@
 #include <linux/moduleparam.h>
 #include <linux/list.h>
 
-#ifdef CONFIG_DAHDI_NET
-#include <linux/netdevice.h>
-#endif /* CONFIG_DAHDI_NET */
-
 #include <linux/ppp_defs.h>
-#ifdef CONFIG_DAHDI_PPP
-#include <linux/netdevice.h>
-#include <linux/if.h>
-#include <linux/if_ppp.h>
-#endif
 
 #include <asm/atomic.h>
 
 #define module_printk(level, fmt, args...) printk(level "%s: " fmt, THIS_MODULE->name, ## args)
-
-#ifndef CONFIG_OLD_HDLC_API
-#define NEW_HDLC_INTERFACE
-#endif
 
 /* #define BUF_MUNGE */
 
@@ -73,6 +60,20 @@
 #define FAST_HDLC_NEED_TABLES
 #include <dahdi/kernel.h>
 #include "ecdis.h"
+
+#ifndef CONFIG_OLD_HDLC_API
+#define NEW_HDLC_INTERFACE
+#endif
+
+#ifdef CONFIG_DAHDI_PPP
+#include <linux/netdevice.h>
+#include <linux/if.h>
+#include <linux/if_ppp.h>
+#endif
+
+#ifdef CONFIG_DAHDI_NET
+#include <linux/netdevice.h>
+#endif
 
 #include "hpec/hpec_user.h"
 
@@ -1775,7 +1776,7 @@
 	int x,oldbuf;
 	unsigned int fcs;
 	unsigned char *data;
-	long flags;
+	unsigned long flags;
 	int retval = 0;
 
 	/* See if we have any buffers */
@@ -5110,10 +5111,6 @@
 					chan->ec_state = NULL;
 					ec_current = chan->ec_current;
 					chan->ec_current = NULL;
-					chan->echocancel = 0;
-					chan->echostate = ECHO_MODE_IDLE;
-					chan->echolastupdate = 0;
-					chan->echotimer = 0;
 					/* Make sure there's no gain */
 					if (chan->gainalloc)
 						kfree(chan->rxgain);
@@ -5125,7 +5122,7 @@
 					hw_echocancel_off(chan);
 
 					if (tec) {
-						tec->owner->echocan_free(tec);
+						tec->ops->echocan_free(tec);
 						release_echocan(ec_current);
 					}
 				} else