[Asterisk-cvs] zaptel zaptel.c,1.65,1.66 zconfig.h,1.5,1.6

[markster at lists.digium.com]

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

Modified Files:
	zaptel.c zconfig.h 
Log Message:
Try to accomodate the ever-changing HDLC API.  Go kernel maintainers.  Way to change the API unnecessarily in a "stable" release.


Index: zaptel.c
===================================================================
RCS file: /usr/cvsroot/zaptel/zaptel.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- zaptel.c	8 Apr 2004 20:18:51 -0000	1.65
+++ zaptel.c	9 Apr 2004 17:54:05 -0000	1.66
@@ -3015,7 +3015,9 @@
 /*				struct hdlc_device *hdlc = chans[ch.chan]->hdlcnetdev;
 				struct net_device *d = hdlc_to_dev(hdlc); mmm...get it right later --byg */
 				chans[ch.chan]->hdlcnetdev->chan = chans[ch.chan];
+#ifdef HDLC_MAINTAINERS_ARE_MORE_STUPID_THAN_I_THOUGHT
 				chans[ch.chan]->hdlcnetdev->netdev.ioctl = zt_net_ioctl;
+#endif
 				chans[ch.chan]->hdlcnetdev->netdev.netdev.do_ioctl = zt_net_ioctl;
 #ifdef NEW_HDLC_INTERFACE
 				chans[ch.chan]->hdlcnetdev->netdev.netdev.open = zt_net_open;

Index: zconfig.h
===================================================================
RCS file: /usr/cvsroot/zaptel/zconfig.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- zconfig.h	19 Mar 2004 09:10:09 -0000	1.5
+++ zconfig.h	9 Apr 2004 17:54:05 -0000	1.6
@@ -61,6 +61,10 @@
 #define CONFIG_ZAPATA_NET
 #if LINUX_VERSION_CODE <= KERNEL_VERSION(2,4,20)
 #define CONFIG_OLD_HDLC_API
+#else
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,3)
+#define HDLC_MAINTAINERS_ARE_MORE_STUPID_THAN_I_THOUGHT
+#endif
 #endif
 #endif
 #ifdef CONFIG_PPP