xnu-792.6.61.tar.gz

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

diff --git a/bsd/net/if_atm.h b/bsd/net/if_atm.h
index 2d79db332b2529a4c2f9b56379510194fac6cd0a..e8fe0eceb09ead90cd5b6068a20563cb443d06c3 100644 (file)
--- a/bsd/net/if_atm.h
+++ b/bsd/net/if_atm.h
@@ -20,6 +20,7 @@
  * @APPLE_LICENSE_HEADER_END@
  */
 /*      $NetBSD: if_atm.h,v 1.7 1996/11/09 23:02:27 chuck Exp $       */
+/* $FreeBSD: src/sys/net/if_atm.h,v 1.4 1999/12/29 04:38:34 peter Exp $ */
 
 /*
  *
@@ -57,20 +58,13 @@
  * net/if_atm.h
  */
 
-
-#ifndef NO_ATM_PVCEXT
-/*
- * ATM_PVCEXT enables PVC extention: VP/VC shaping
- * and PVC shadow interfaces.
- */
-#define ATM_PVCEXT     /* enable pvc extention */
-#endif
-
+#ifdef KERNEL_PRIVATE
 #if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__)
 #define RTALLOC1(A,B)          rtalloc1((A),(B))
-#elif defined(__FreeBSD__)
+#elif defined(__FreeBSD__) || defined(__APPLE__)
 #define RTALLOC1(A,B)          rtalloc1((A),(B),0UL)
 #endif
+#endif /* KERNEL_PRIVATE */
 
 /*
  * pseudo header for packet transmission
@@ -90,9 +84,6 @@ struct atm_pseudohdr {
 #define ATM_PH_AAL5    0x01    /* use AAL5? (0 == aal0) */
 #define ATM_PH_LLCSNAP 0x02    /* use the LLC SNAP encoding (iff aal5) */
 
-#if ATM_PVCEXT
-#define ATM_PH_INERNAL  0x20   /* reserve for kernel internal use */
-#endif
 #define ATM_PH_DRIVER7  0x40   /* reserve for driver's use */
 #define ATM_PH_DRIVER8  0x80   /* reserve for driver's use */
 
@@ -111,28 +102,6 @@ struct atm_pseudoioctl {
 #define SIOCATMENA     _IOWR('a', 123, struct atm_pseudoioctl) /* enable */
 #define SIOCATMDIS     _IOWR('a', 124, struct atm_pseudoioctl) /* disable */
 
-#if ATM_PVCEXT
-
-/* structure to control PVC transmitter */
-struct pvctxreq {
-    /* first entry must be compatible with struct ifreq */
-    char pvc_ifname[IFNAMSIZ];         /* if name, e.g. "en0" */
-    struct atm_pseudohdr pvc_aph;      /* (flags) + vpi:vci */
-    struct atm_pseudohdr pvc_joint;    /* for vp shaping: another vc
-                                          to share the shaper */
-    int pvc_pcr;                       /* peak cell rate (shaper value) */
-};
-
-/* use ifioctl for now */
-#define SIOCSPVCTX     _IOWR('i', 95, struct pvctxreq)
-#define SIOCGPVCTX     _IOWR('i', 96, struct pvctxreq)
-#define SIOCSPVCSIF    _IOWR('i', 97, struct ifreq)
-#define SIOCGPVCSIF    _IOWR('i', 98, struct ifreq)
-
-#ifdef KERNEL
-#define ATM_PH_PVCSIF  ATM_PH_INERNAL  /* pvc shadow interface */
-#endif
-#endif /* ATM_PVCEXT */
 
 /*
  * XXX forget all the garbage in if_llc.h and do it the easy way
@@ -151,17 +120,11 @@ struct atmllc {
        (X)->type[0] = ((V) & 0xff); \
 }
 
-#ifdef KERNEL
-void   atm_ifattach __P((struct ifnet *));
-void   atm_input __P((struct ifnet *, struct atm_pseudohdr *,
-               struct mbuf *, void *));
-int    atm_output __P((struct ifnet *, struct mbuf *, struct sockaddr *, 
-               struct rtentry *));
-#endif
-#if ATM_PVCEXT
-char *shadow2if __P((char *));
-#ifdef KERNEL
-struct ifnet *pvc_attach __P((struct ifnet *));
-int pvc_setaph __P((struct ifnet *, struct atm_pseudohdr *));
-#endif
-#endif
+#ifdef KERNEL_PRIVATE
+void   atm_ifattach(struct ifnet *);
+void   atm_input(struct ifnet *, struct atm_pseudohdr *,
+               struct mbuf *, void *);
+int    atm_output(struct ifnet *, struct mbuf *, struct sockaddr *, 
+               struct rtentry *);
+#endif /* KERNEL_PRIVATE */
+