xnu-792.tar.gz

[apple/xnu.git] / bsd / net / if_pppvar.h

diff --git a/bsd/net/if_pppvar.h b/bsd/net/if_pppvar.h
index d7a6ee6ad638bf841689b1f01043eb5c9891ee0e..35628358c6fae78e970ea1b9f6a9edb07033ff37 100644 (file)
--- a/bsd/net/if_pppvar.h
+++ b/bsd/net/if_pppvar.h
@@ -3,22 +3,19 @@
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
  * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
@@ -71,7 +68,7 @@
 #warning if_pppvar.h is not used by the darwin kernel
 #endif
 
-#ifdef __APPLE_API_PRIVATE
+#ifdef KERNEL_PRIVATE
 
 /*
  * Supported network protocols.  These values are used for
@@ -88,10 +85,10 @@ struct ppp_softc {
 /*hi*/ u_int   sc_flags;               /* control/status bits; see if_ppp.h */
        struct  callout_handle sc_ch;   /* Used for scheduling timeouts */
        void    *sc_devp;               /* pointer to device-dep structure */
-       void    (*sc_start) __P((struct ppp_softc *));  /* start output proc */
-       void    (*sc_ctlp) __P((struct ppp_softc *)); /* rcvd control pkt */
-       void    (*sc_relinq) __P((struct ppp_softc *)); /* relinquish ifunit */
-       void    (*sc_setmtu) __P((struct ppp_softc *)); /* set mtu */
+       void    (*sc_start)(struct ppp_softc *);        /* start output proc */
+       void    (*sc_ctlp)(struct ppp_softc *); /* rcvd control pkt */
+       void    (*sc_relinq)(struct ppp_softc *); /* relinquish ifunit */
+       void    (*sc_setmtu)(struct ppp_softc *); /* set mtu */
        short   sc_mru;                 /* max receive unit */
        pid_t   sc_xfer;                /* used in transferring unit */
 /*hi*/ struct  ifqueue sc_rawq;        /* received packets */
@@ -131,13 +128,13 @@ struct ppp_softc {
 
 extern struct ppp_softc ppp_softc[];
 
-struct ppp_softc *pppalloc __P((pid_t pid));
-void   pppdealloc __P((struct ppp_softc *sc));
-int    pppioctl __P((struct ppp_softc *sc, u_long cmd, caddr_t data,
-                     int flag, struct proc *p));
-int    pppoutput __P((struct ifnet *ifp, struct mbuf *m0,
-                      struct sockaddr *dst, struct rtentry *rtp));
-void   ppp_restart __P((struct ppp_softc *sc));
-void   ppppktin __P((struct ppp_softc *sc, struct mbuf *m, int lost));
-struct mbuf *ppp_dequeue __P((struct ppp_softc *sc));
+struct ppp_softc *pppalloc(pid_t pid);
+void   pppdealloc(struct ppp_softc *sc);
+int    pppioctl(struct ppp_softc *sc, u_long cmd, caddr_t data,
+                     int flag, struct proc *p);
+int    pppoutput(struct ifnet *ifp, struct mbuf *m0,
+                      struct sockaddr *dst, struct rtentry *rtp);
+void   ppp_restart(struct ppp_softc *sc);
+void   ppppktin(struct ppp_softc *sc, struct mbuf *m, int lost);
+struct mbuf *ppp_dequeue(struct ppp_softc *sc);
 #endif /* __APPLE_API_PRIVATE */