[src/netbsd-1-5]: src/sys/netinet Pull up revision 1.124 (requested by itojun):

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

details:   https://anonhg.NetBSD.org/src/rev/a853f13fe8d6
branches:  netbsd-1-5
changeset: 491697:a853f13fe8d6
user:      he <he%NetBSD.org@localhost>
date:      Wed May 09 19:37:19 2001 +0000

description:
Pull up revision 1.124 (requested by itojun):
  Correct faith prefix determintaion.

diffstat:

 sys/netinet/tcp_input.c |  16 +++++++---------
 1 files changed, 7 insertions(+), 9 deletions(-)

diffs (44 lines):

diff -r 81fed01e3419 -r a853f13fe8d6 sys/netinet/tcp_input.c
--- a/sys/netinet/tcp_input.c   Wed May 09 19:37:00 2001 +0000
+++ b/sys/netinet/tcp_input.c   Wed May 09 19:37:19 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: tcp_input.c,v 1.108.4.8 2001/04/06 00:25:58 he Exp $   */
+/*     $NetBSD: tcp_input.c,v 1.108.4.9 2001/05/09 19:37:19 he Exp $   */
 
 /*
 %%% portions-copyright-nrl-95
@@ -185,6 +185,9 @@
 #endif /*IPSEC*/
 #ifdef INET6
 #include "faith.h"
+#if defined(NFAITH) && NFAITH > 0
+#include <net/if_faith.h>
+#endif
 #endif
 
 int    tcprexmtthresh = 3;
@@ -530,9 +533,8 @@
                        }
                }
                ip6 = mtod(m, struct ip6_hdr *);
-               icmp6_error(m, ICMP6_DST_UNREACH,
-                       ICMP6_DST_UNREACH_ADDR,
-                       (caddr_t)&ip6->ip6_dst - (caddr_t)ip6);
+               icmp6_error(m, ICMP6_DST_UNREACH, ICMP6_DST_UNREACH_ADDR,
+                   (caddr_t)&ip6->ip6_dst - (caddr_t)ip6);
                return IPPROTO_DONE;
        }
 
@@ -883,11 +885,7 @@
                int faith;
 
 #if defined(NFAITH) && NFAITH > 0
-               if (m->m_pkthdr.rcvif
-                && m->m_pkthdr.rcvif->if_type == IFT_FAITH) {
-                       faith = 1;
-               } else
-                       faith = 0;
+               faith = faithprefix(&ip6->ip6_dst);
 #else
                faith = 0;
 #endif