Try to accomodate the ever-changing HDLC API. Go kernel maintainers. Way to change the API unnecessarily in a "stable" release.

git-svn-id: http://svn.digium.com/svn/zaptel/trunk@354 5390a7c7-147a-4af0-8ec9-7488f05a26cb

2 files changed, 6 insertions, 0 deletions

diff --git a/zaptel.c b/zaptel.c
index 9f7688a..82f69b5 100755
--- a/zaptel.c
+++ b/zaptel.c
@@ -3015,7 +3015,9 @@ static int zt_ctl_ioctl(struct inode *inode, struct file *file, unsigned int cmd
 /*				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;
diff --git a/zconfig.h b/zconfig.h
index 70dbfaf..1b63cf2 100755
--- a/zconfig.h
+++ b/zconfig.h
@@ -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