[Asterisk-cvs] zaptel zconfig.h,1.7,1.8 zaptel.c,1.80,1.81

[citats at lists.digium.com]

Update of /usr/cvsroot/zaptel
In directory mongoose.digium.com:/home/citats/cvs/zaptel

Modified Files:
	zconfig.h zaptel.c 
Log Message:
Yet another HDLC change starting with 2.4.23.  Now we use hdlc_type_trans

Index: zconfig.h
===================================================================
RCS file: /usr/cvsroot/zaptel/zconfig.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- zconfig.h	21 Jun 2004 04:32:42 -0000	1.7
+++ zconfig.h	21 Jun 2004 17:33:36 -0000	1.8
@@ -62,6 +62,11 @@
 #if LINUX_VERSION_CODE <= KERNEL_VERSION(2,4,20)
 #define CONFIG_OLD_HDLC_API
 #else
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,23)
+/* Starting with 2.4.23 the kernel hdlc api changed again */
+/* Now we have to use hdlc_type_trans(skb, dev) instead of htons(ETH_P_HDLC) */
+#define ZAP_HDLC_TYPE_TRANS
+#endif
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,3)
 #define HDLC_MAINTAINERS_ARE_MORE_STUPID_THAN_I_THOUGHT
 #endif

Index: zaptel.c
===================================================================
RCS file: /usr/cvsroot/zaptel/zaptel.c,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -d -r1.80 -r1.81
--- zaptel.c	20 Jun 2004 04:25:53 -0000	1.80
+++ zaptel.c	21 Jun 2004 17:33:36 -0000	1.81
@@ -5506,7 +5506,7 @@
 		{
 			skb->mac.raw = skb->data;
 			skb->dev = &ms->hdlcnetdev->netdev.netdev;
-#if 0
+#ifdef ZAP_HDLC_TYPE_TRANS
 			skb->protocol = hdlc_type_trans(skb, &ms->hdlcnetdev->netdev.netdev);
 #else
 			skb->protocol = htons (ETH_P_HDLC);