patch-2.3.14 linux/include/linux/isdn_ppp.h

Next file: linux/include/linux/isdnif.h
Previous file: linux/include/linux/isdn_divertif.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.13/linux/include/linux/isdn_ppp.h linux/include/linux/isdn_ppp.h
@@ -4,6 +4,7 @@
 #define _LINUX_ISDN_PPP_H
 
 #include <linux/config.h>
+#include <linux/isdn_compat.h>
 
 #define CALLTYPE_INCOMING 0x1
 #define CALLTYPE_OUTGOING 0x2
@@ -206,10 +207,10 @@
   struct ippp_buf_queue rq[NUM_RCV_BUFFS]; /* packet queue for isdn_ppp_read() */
   struct ippp_buf_queue *first;  /* pointer to (current) first packet */
   struct ippp_buf_queue *last;   /* pointer to (current) last used packet in queue */
-#if LINUX_VERSION_CODE < 131841
-  struct wait_queue *wq;
-#else
+#ifdef COMPAT_HAS_NEW_WAITQ
   wait_queue_head_t wq;
+#else
+  struct wait_queue *wq;
 #endif
   struct task_struct *tk;
   unsigned int mpppcfg;
@@ -237,6 +238,4 @@
 };
 
 #endif /* __KERNEL__ */
-
 #endif /* _LINUX_ISDN_PPP_H */
-

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)