View | Details | Raw Unified | Return to bug 193280 | Differences between
and this patch

Collapse All | Expand All

(-)b/sys/netinet6/nd6_nbr.c (-1 / +1 lines)
Lines 534-540 nd6_ns_output_fib(struct ifnet *ifp, const struct in6_addr *saddr6, Link Here
534
	 *	Multicast NS		MUST add one	add the option
534
	 *	Multicast NS		MUST add one	add the option
535
	 *	Unicast NS		SHOULD add one	add the option
535
	 *	Unicast NS		SHOULD add one	add the option
536
	 */
536
	 */
537
	if (nonce == NULL && (mac = nd6_ifptomac(ifp))) {
537
	if (nonce == NULL && ((ifp->if_carp && (mac = (*carp_macmatch6_p)(ifp, m, &ip6->ip6_src))) || (mac = nd6_ifptomac(ifp)))) {
538
		int optlen = sizeof(struct nd_opt_hdr) + ifp->if_addrlen;
538
		int optlen = sizeof(struct nd_opt_hdr) + ifp->if_addrlen;
539
		struct nd_opt_hdr *nd_opt = (struct nd_opt_hdr *)(nd_ns + 1);
539
		struct nd_opt_hdr *nd_opt = (struct nd_opt_hdr *)(nd_ns + 1);
540
		/* 8 byte alignments... */
540
		/* 8 byte alignments... */

Return to bug 193280