update

[ppp.git] / freebsd-2.0 / ppp_tty.c

diff --git a/freebsd-2.0/ppp_tty.c b/freebsd-2.0/ppp_tty.c
index 01040de4748b2cc67e73aadb439b1e12da67af4e..912f0831a27c7081ee9a8abbc2a86416154de7eb 100644 (file)
--- a/freebsd-2.0/ppp_tty.c
+++ b/freebsd-2.0/ppp_tty.c
@@ -70,7 +70,7 @@
  * Paul Mackerras (paulus@cs.anu.edu.au).
  */
 
-/* $Id: ppp_tty.c,v 1.5 1996/07/01 01:00:31 paulus Exp $ */
+/* $Id: ppp_tty.c,v 1.8 1997/04/30 05:42:08 paulus Exp $ */
 /* from if_sl.c,v 1.11 84/10/04 12:54:47 rick Exp */
 /* from NetBSD: if_ppp.c,v 1.15.2.2 1994/07/28 05:17:58 cgd Exp */
 
@@ -103,6 +103,9 @@
 #include <net/pppcompress.h>
 #endif
 
+#ifdef PPP_FILTER
+#include <net/bpf.h>
+#endif
 #include <net/ppp_defs.h>
 #include <net/if_ppp.h>
 #include <net/if_pppvar.h>
@@ -112,7 +115,7 @@ int pppopen __P((dev_t dev, struct tty *tp));
 int    pppclose __P((struct tty *tp, int flag));
 int    pppread __P((struct tty *tp, struct uio *uio, int flag));
 int    pppwrite __P((struct tty *tp, struct uio *uio, int flag));
-int    ppptioctl __P((struct tty *tp, u_long cmd, caddr_t data, int flag,
+int    ppptioctl __P((struct tty *tp, int cmd, caddr_t data, int flag,
                       struct proc *));
 int    pppinput __P((int c, struct tty *tp));
 int    pppstart __P((struct tty *tp));
@@ -397,7 +400,7 @@ pppwrite(tp, uio, flag)
 int
 ppptioctl(tp, cmd, data, flag, p)
     struct tty *tp;
-    u_long cmd;
+    int cmd;
     caddr_t data;
     int flag;
     struct proc *p;
@@ -507,7 +510,7 @@ pppfcs(fcs, cp, len)
 }
 
 /*
- * This gets called at splnet from if_ppp.c at various times
+ * This gets called at splsoftnet from if_ppp.c at various times
  * when there is data ready to be sent.
  */
 static void
@@ -691,7 +694,7 @@ pppasyncstart(sc)
 
 /*
  * This gets called when a received packet is placed on
- * the inq, at splnet.
+ * the inq, at splsoftnet.
  */
 static void
 pppasyncctlp(sc)
@@ -711,7 +714,7 @@ pppasyncctlp(sc)
 /*
  * Start output on async tty interface.  If the transmit queue
  * has drained sufficiently, arrange for pppasyncstart to be
- * called later at splnet.
+ * called later at splsoftnet.
  * Called at spltty or higher.
  */
 int