diff options
| author | ume <ume@FreeBSD.org> | 2003-10-10 16:04:00 +0000 |
|---|---|---|
| committer | ume <ume@FreeBSD.org> | 2003-10-10 16:04:00 +0000 |
| commit | a72f1bdb767fa08d3ce42494c037364f31421fb8 (patch) | |
| tree | 0a822f1e32a81df06aa7171ff2072981534b44ad /sys/netinet6/in6_ifattach.c | |
| parent | 8df937af7e7320438f99077b1d70e8f6a6c15068 (diff) | |
| download | FreeBSD-src-a72f1bdb767fa08d3ce42494c037364f31421fb8.zip FreeBSD-src-a72f1bdb767fa08d3ce42494c037364f31421fb8.tar.gz | |
nuke SCOPEDROUTING. Though it was there for a long time,
it was never enabled.
Diffstat (limited to 'sys/netinet6/in6_ifattach.c')
| -rw-r--r-- | sys/netinet6/in6_ifattach.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/sys/netinet6/in6_ifattach.c b/sys/netinet6/in6_ifattach.c index 479d8b0..6b9707c 100644 --- a/sys/netinet6/in6_ifattach.c +++ b/sys/netinet6/in6_ifattach.c @@ -444,11 +444,7 @@ in6_ifattach_linklocal(ifp, altifp) ifra.ifra_addr.sin6_family = AF_INET6; ifra.ifra_addr.sin6_len = sizeof(struct sockaddr_in6); ifra.ifra_addr.sin6_addr.s6_addr16[0] = htons(0xfe80); -#ifdef SCOPEDROUTING - ifra.ifra_addr.sin6_addr.s6_addr16[1] = 0 -#else ifra.ifra_addr.sin6_addr.s6_addr16[1] = htons(ifp->if_index); /* XXX */ -#endif ifra.ifra_addr.sin6_addr.s6_addr32[1] = 0; if ((ifp->if_flags & IFF_LOOPBACK) != 0) { ifra.ifra_addr.sin6_addr.s6_addr32[2] = 0; @@ -460,18 +456,10 @@ in6_ifattach_linklocal(ifp, altifp) return (-1); } } -#ifdef SCOPEDROUTING - ifra.ifra_addr.sin6_scope_id = - in6_addr2scopeid(ifp, &ifra.ifra_addr.sin6_addr); -#endif ifra.ifra_prefixmask.sin6_len = sizeof(struct sockaddr_in6); ifra.ifra_prefixmask.sin6_family = AF_INET6; ifra.ifra_prefixmask.sin6_addr = in6mask64; -#ifdef SCOPEDROUTING - /* take into accound the sin6_scope_id field for routing */ - ifra.ifra_prefixmask.sin6_scope_id = 0xffffffff; -#endif /* link-local addresses should NEVER expire. */ ifra.ifra_lifetime.ia6t_vltime = ND6_INFINITE_LIFETIME; ifra.ifra_lifetime.ia6t_pltime = ND6_INFINITE_LIFETIME; |
