D50415.1775912723.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D50415.1775912723.diff
View Options

	diff --git a/sys/netinet6/nd6.c b/sys/netinet6/nd6.c
	--- a/sys/netinet6/nd6.c
	+++ b/sys/netinet6/nd6.c
	@@ -297,23 +297,14 @@
	nd->flags \|= ND6_IFF_IFDISABLED;

	/* A loopback interface always has ND6_IFF_AUTO_LINKLOCAL.
	- * XXXHRS: Clear ND6_IFF_AUTO_LINKLOCAL on an IFT_BRIDGE interface by
	- * default regardless of the V_ip6_auto_linklocal configuration to
	- * give a reasonable default behavior.
	*/
	- if ((V_ip6_auto_linklocal && ifp->if_type != IFT_BRIDGE &&
	- ifp->if_type != IFT_WIREGUARD) \|\| (ifp->if_flags & IFF_LOOPBACK))
	+ if ((V_ip6_auto_linklocal && ifp->if_type != IFT_WIREGUARD) \|\|
	+ (ifp->if_flags & IFF_LOOPBACK))
	nd->flags \|= ND6_IFF_AUTO_LINKLOCAL;
	/*
	* A loopback interface does not need to accept RTADV.
	- * XXXHRS: Clear ND6_IFF_ACCEPT_RTADV on an IFT_BRIDGE interface by
	- * default regardless of the V_ip6_accept_rtadv configuration to
	- * prevent the interface from accepting RA messages arrived
	- * on one of the member interfaces with ND6_IFF_ACCEPT_RTADV.
	*/
	- if (V_ip6_accept_rtadv &&
	- !(ifp->if_flags & IFF_LOOPBACK) &&
	- (ifp->if_type != IFT_BRIDGE)) {
	+ if (V_ip6_accept_rtadv && !(ifp->if_flags & IFF_LOOPBACK)) {
	nd->flags \|= ND6_IFF_ACCEPT_RTADV;
	/* If we globally accept rtadv, assume IPv6 on. */
	nd->flags &= ~ND6_IFF_IFDISABLED;