Date: Thu, 7 Feb 2013 18:47:26 +0000 (UTC) From: "Andrey V. Elsukov" <ae@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r246494 - user/ae/inet6/sys/netinet6 Message-ID: <201302071847.r17IlQFv062442@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ae Date: Thu Feb 7 18:47:25 2013 New Revision: 246494 URL: http://svnweb.freebsd.org/changeset/base/246494 Log: Remove in6_clearscope and sa6_recoverscope calls. Modified: user/ae/inet6/sys/netinet6/ip6_input.c Modified: user/ae/inet6/sys/netinet6/ip6_input.c ============================================================================== --- user/ae/inet6/sys/netinet6/ip6_input.c Thu Feb 7 18:00:33 2013 (r246493) +++ user/ae/inet6/sys/netinet6/ip6_input.c Thu Feb 7 18:47:25 2013 (r246494) @@ -1305,7 +1305,6 @@ ip6_savecontrol_v4(struct inpcb *inp, st #endif } else { bcopy(&ip6->ip6_dst, &pi6.ipi6_addr, sizeof(struct in6_addr)); - in6_clearscope(&pi6.ipi6_addr); /* XXX */ } pi6.ipi6_ifindex = (m && m->m_pkthdr.rcvif) ? m->m_pkthdr.rcvif->if_index : 0; @@ -1576,13 +1575,8 @@ ip6_notify_pmtu(struct inpcb *in6p, stru if (so == NULL) /* I believe this is impossible */ panic("ip6_notify_pmtu: socket is NULL"); #endif - - bzero(&mtuctl, sizeof(mtuctl)); /* zero-clear for safety */ mtuctl.ip6m_mtu = *mtu; mtuctl.ip6m_addr = *dst; - if (sa6_recoverscope(&mtuctl.ip6m_addr)) - return; - if ((m_mtu = sbcreatecontrol((caddr_t)&mtuctl, sizeof(mtuctl), IPV6_PATHMTU, IPPROTO_IPV6)) == NULL) return;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201302071847.r17IlQFv062442>