[src/netbsd-1-5]: src/sys/net Pullup 1.6 [itojun]:

[tv <tv%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ff7196b3d8ed
branches:  netbsd-1-5
changeset: 489765:ff7196b3d8ed
user:      tv <tv%NetBSD.org@localhost>
date:      Tue Oct 17 01:23:49 2000 +0000

description:
Pullup 1.6 [itojun]:
fix IPv6 packet manipulation.  (use ip6intrq)

diffstat:

 sys/net/if_hippisubr.c |  15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)

diffs (55 lines):

diff -r c1331e418a1e -r ff7196b3d8ed sys/net/if_hippisubr.c
--- a/sys/net/if_hippisubr.c    Tue Oct 17 01:21:01 2000 +0000
+++ b/sys/net/if_hippisubr.c    Tue Oct 17 01:23:49 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_hippisubr.c,v 1.5 2000/03/30 09:45:35 augustss Exp $        */
+/*     $NetBSD: if_hippisubr.c,v 1.5.4.1 2000/10/17 01:23:49 tv Exp $  */
 
 /*
  * Copyright (c) 1982, 1989, 1993
@@ -58,7 +58,7 @@
 #include <net/if_hippi.h>
 
 #include <netinet/in.h>
-#ifdef INET
+#if defined(INET) || defined(INET6)
 #include <netinet/in_var.h>
 #endif
 
@@ -278,14 +278,17 @@
        m_adj(m, 8);
        switch (htype) {
 #ifdef INET
-#ifdef INET6
-       case ETHERTYPE_IPV6:
-#endif
        case ETHERTYPE_IP:
                schednetisr(NETISR_IP);
                inq = &ipintrq;
                break;
 #endif
+#ifdef INET6
+       case ETHERTYPE_IPV6:
+               schednetisr(NETISR_IPV6);
+               inq = &ip6intrq;
+               break;
+#endif
        default:
                m_freem(m);
                return;
@@ -304,6 +307,7 @@
  * Handle packet from HIPPI that has no MAC header
  */
 
+#ifdef INET
 void
 hippi_ip_input(ifp, m)
        struct ifnet *ifp;
@@ -326,6 +330,7 @@
                IF_ENQUEUE(inq, m);
        splx(s);
 }
+#endif
 
 
 /*