checkpoint further progress, still doesn't connect tho.

[unix-history] / usr / src / sys / netiso / iso_var.h

diff --git a/usr/src/sys/netiso/iso_var.h b/usr/src/sys/netiso/iso_var.h
index 90394d1..3f714ac 100644 (file)
--- a/usr/src/sys/netiso/iso_var.h
+++ b/usr/src/sys/netiso/iso_var.h
@@ -1,3 +1,12 @@
+/*-
+ * Copyright (c) 1988, 1991 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * %sccs.include.redist.c%
+ *
+ *     @(#)iso_var.h   7.5 (Berkeley) %G%
+ */
+

 /***********************************************************
                Copyright IBM Corporation 1987
 
 /***********************************************************
                Copyright IBM Corporation 1987
 


@@ -20,25 +29,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
 SOFTWARE.
 
 ******************************************************************/

-/*
- * Modifications,
- * Copyright (c) 1988 Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- *
- *     @(#)iso_var.h   7.2 (Berkeley) %G%
- */

 
 /*
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
 
 /*
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison


@@ -56,7 +46,7 @@ SOFTWARE.
 struct iso_ifaddr {
        struct ifaddr           ia_ifa;         /* protocol-independent info */
 #define ia_ifp         ia_ifa.ifa_ifp
 struct iso_ifaddr {
        struct ifaddr           ia_ifa;         /* protocol-independent info */
 #define ia_ifp         ia_ifa.ifa_ifp

-       int                                     ia_flags;
+#define        ia_flags        ia_ifa.ifa_flags

        int                                     ia_snpaoffset;
        struct iso_ifaddr       *ia_next;       /* next in list of iso addresses */
        struct  sockaddr_iso ia_addr;   /* reserve space for interface name */
        int                                     ia_snpaoffset;
        struct iso_ifaddr       *ia_next;       /* next in list of iso addresses */
        struct  sockaddr_iso ia_addr;   /* reserve space for interface name */


@@ -94,20 +84,6 @@ struct       iso_ifreq {
 #define        SIOCGIFDSTADDR_ISO _IOWR('i',34, struct iso_ifreq) /* get dst address */
 #define        SIOCGIFNETMASK_ISO _IOWR('i',37, struct iso_ifreq) /* get dst address */
 
 #define        SIOCGIFDSTADDR_ISO _IOWR('i',34, struct iso_ifreq) /* get dst address */
 #define        SIOCGIFNETMASK_ISO _IOWR('i',37, struct iso_ifreq) /* get dst address */
 

-#ifndef IFA_ROUTE
-#define        IFA_ROUTE       0x01            /* routing entry installed */
-#endif
-
-/* ISO arp IOCTL data structures */
-struct arpreq_iso {
-       int     arp_flags;                      /* flags */
-       struct  sockaddr_iso arp_pa;            /* protocol address */
-       struct  sockaddr arp_ha;                /* hardware address */
-};
-
-#define        SIOCSISOMAP     _IOW('a',30, struct arpreq_iso) /* set arp entry */
-#define        SIOCGISOMAP     _IOWR('a',38, struct arpreq_iso)/* get arp entry */
-#define        SIOCDISOMAP     _IOW('a',31, struct arpreq_iso) /* delete arp entry */

 /*
  * This stuff should go in if.h or if_llc.h or someplace else,
  * but for now . . .
 /*
  * This stuff should go in if.h or if_llc.h or someplace else,
  * but for now . . .