BSD 4_4 release

[unix-history] / usr / src / sys / tahoe / if / if_ex.c

diff --git a/usr/src/sys/tahoe/if/if_ex.c b/usr/src/sys/tahoe/if/if_ex.c
index 2ece6f7..974a6bb 100644 (file)
--- a/usr/src/sys/tahoe/if/if_ex.c
+++ b/usr/src/sys/tahoe/if/if_ex.c
@@ -5,19 +5,35 @@
  * This code is derived from software contributed to Berkeley by
  * Excelan Inc.
  *
  * This code is derived from software contributed to Berkeley by
  * Excelan Inc.
  *

- * 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 MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.

  *
  *

- *     @(#)if_ex.c     7.2 (Berkeley) %G%
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *     @(#)if_ex.c     7.5 (Berkeley) 12/16/90

  */
 
 #include "ex.h"
  */
 
 #include "ex.h"


@@ -27,48 +43,47 @@
 /*
  * Excelan EXOS 202(VME) & 203(QBUS) Link Level Ethernet Interface Drivers
  */
 /*
  * Excelan EXOS 202(VME) & 203(QBUS) Link Level Ethernet Interface Drivers
  */

-#include "param.h"
-#include "systm.h"
-#include "mbuf.h"
-#include "buf.h"
-#include "protosw.h"
-#include "socket.h"
-#include "vmmac.h"
-#include "ioctl.h"
-#include "errno.h"
-#include "vmparam.h"
-#include "syslog.h"
-#include "uio.h"
-
-#include "../net/if.h"
-#include "../net/netisr.h"
-#include "../net/route.h"
+#include "sys/param.h"
+#include "sys/systm.h"
+#include "sys/mbuf.h"
+#include "sys/buf.h"
+#include "sys/protosw.h"
+#include "sys/socket.h"
+#include "sys/vmmac.h"
+#include "sys/ioctl.h"
+#include "sys/errno.h"
+#include "sys/vmparam.h"
+#include "sys/syslog.h"
+#include "sys/uio.h"
+
+#include "net/if.h"
+#include "net/netisr.h"
+#include "net/route.h"

 
 #ifdef INET
 
 #ifdef INET

-#include "../netinet/in.h"
-#include "../netinet/in_systm.h"
-#include "../netinet/in_var.h"
-#include "../netinet/ip.h"
-#include "../netinet/if_ether.h"
+#include "netinet/in.h"
+#include "netinet/in_systm.h"
+#include "netinet/in_var.h"
+#include "netinet/ip.h"
+#include "netinet/if_ether.h"

 #endif
 
 #ifdef NS
 #endif
 
 #ifdef NS

-#include "../netns/ns.h"
-#include "../netns/ns_if.h"
+#include "netns/ns.h"
+#include "netns/ns_if.h"

 #endif
 
 #ifdef ISO
 #endif
 
 #ifdef ISO

-#include "../netiso/iso.h"
-#include "../netiso/iso_var.h"
-#include "../netiso/iso_snpac.h"
-extern struct snpa_cache all_es, all_is;
+#include "netiso/iso.h"
+#include "netiso/iso_var.h"
+extern char all_es_snpa[], all_is_snpa[];

 #endif 
 
 #endif 
 

-#include "../tahoe/cpu.h"
-#include "../tahoe/pte.h"
-#include "../tahoe/mtpr.h"
+#include "../include/cpu.h"
+#include "../include/pte.h"
+#include "../include/mtpr.h"

 
 

-#include "../tahoevba/vbavar.h"
+#include "../vba/vbavar.h"

 #include "if_exreg.h"
 #include "if_vba.h"
 
 #include "if_exreg.h"
 #include "if_vba.h"
 


@@ -313,8 +328,8 @@ int unit;
        if (xs->xs_flags & EX_SETADDR)
                ex_setaddr((u_char *)0, unit);
 #ifdef ISO
        if (xs->xs_flags & EX_SETADDR)
                ex_setaddr((u_char *)0, unit);
 #ifdef ISO

-       ex_setmulti(all_es.sc_snpa, unit, 1);
-       ex_setmulti(all_is.sc_snpa, unit, 2);
+       ex_setmulti(all_es_snpa, unit, 1);
+       ex_setmulti(all_is_snpa, unit, 2);

 #endif
        exstart(&ex_softc[unit].xs_if);         /* start transmits */
        splx(s);                /* are interrupts disabled here, anyway? */
 #endif
        exstart(&ex_softc[unit].xs_if);         /* start transmits */
        splx(s);                /* are interrupts disabled here, anyway? */