[Asterisk-cvs] zaptel zaptel.c,1.103,1.104 zconfig.h,1.13,1.14

[mattf at lists.digium.com]

Update of /usr/cvsroot/zaptel
In directory mongoose.digium.com:/tmp/cvs-serv32295

Modified Files:
	zaptel.c zconfig.h 
Log Message:
HDLC compilation fixes.  Tested to compile correctly for all HDLC changes
between 2.4.20 and 2.4.30


Index: zaptel.c
===================================================================
RCS file: /usr/cvsroot/zaptel/zaptel.c,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -d -r1.103 -r1.104
--- zaptel.c	15 Jan 2005 22:59:18 -0000	1.103
+++ zaptel.c	27 Apr 2005 20:35:05 -0000	1.104
@@ -1268,7 +1268,9 @@
 #ifdef LINUX26
 	hdlc_close(dev);
 #else
+#ifndef CONFIG_OLD_HDLC_API
 	hdlc_close(hdlc);
+#endif
 #endif	
 #ifndef LINUX26
 	MOD_DEC_USE_COUNT;
@@ -3187,7 +3189,7 @@
 				chans[ch.chan]->hdlcnetdev->netdev.close = zt_net_close;
 				chans[ch.chan]->hdlcnetdev->netdev.set_mode = NULL;
 				chans[ch.chan]->hdlcnetdev->netdev.xmit = zt_xmit;
-#endif
+#endif /* NEW_HDLC_INTERFACE */
 				chans[ch.chan]->hdlcnetdev->netdev.netdev.irq = chans[ch.chan]->span->irq;
 				chans[ch.chan]->hdlcnetdev->netdev.netdev.tx_queue_len = 50;
 				res = register_hdlc_device(&chans[ch.chan]->hdlcnetdev->netdev);

Index: zconfig.h
===================================================================
RCS file: /usr/cvsroot/zaptel/zconfig.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- zconfig.h	29 Dec 2004 14:10:56 -0000	1.13
+++ zconfig.h	27 Apr 2005 20:35:05 -0000	1.14
@@ -70,8 +70,8 @@
 /* We now use the linux kernel config to detect which options to use */
 /* You can still override them below */
 #if defined(CONFIG_HDLC) || defined(CONFIG_HDLC_MODULE)
-/* #define CONFIG_ZAPATA_NET */ /* NEVER implicitly turn on ZAPATA_NET */
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,4,19)
+/* #define CONFIG_ZAPATA_NET */  /* NEVER implicitly turn on ZAPATA_NET */
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,4,20)
 #define CONFIG_OLD_HDLC_API
 #else
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,23)