Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pull up following revision(s) (requested by ozaki-r in ticket #1707): 

sys/netinet6/in6.c: revision 1.289
	sys/netinet6/ip6_output.c: revision 1.234

in6: clear ND6_IFF_IFDISABLED to allow DAD again on link-up

in6: don't send any IPv6 packets over a disabled interface
This commit is contained in:
martin 2023-08-04 14:29:44 +00:00
parent 0386f1a91f
commit df28f36688
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/netinet6/in6.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: in6.c,v 1.275.2.1 2020/10/08 18:04:59 martin Exp $ */
/* $NetBSD: in6.c,v 1.275.2.2 2023/08/04 14:29:44 martin Exp $ */
/* $KAME: in6.c,v 1.198 2001/07/18 09:12:38 itojun Exp $ */
/*
@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: in6.c,v 1.275.2.1 2020/10/08 18:04:59 martin Exp $");
__KERNEL_RCSID(0, "$NetBSD: in6.c,v 1.275.2.2 2023/08/04 14:29:44 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@ -2310,6 +2310,10 @@ in6_if_link_down(struct ifnet *ifp)
}
pserialize_read_exit(s);
curlwp_bindx(bound);
/* Clear ND6_IFF_IFDISABLED to allow DAD again on link-up. */
if (ifp->if_afdata[AF_INET6] != NULL)
ND_IFINFO(ifp)->flags &= ~ND6_IFF_IFDISABLED;
}
void

10
sys/netinet6/ip6_output.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ip6_output.c,v 1.220.2.1 2023/03/23 12:06:49 martin Exp $ */
/* $NetBSD: ip6_output.c,v 1.220.2.2 2023/08/04 14:29:44 martin Exp $ */
/* $KAME: ip6_output.c,v 1.172 2001/03/25 09:55:56 itojun Exp $ */
/*
@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ip6_output.c,v 1.220.2.1 2023/03/23 12:06:49 martin Exp $");
__KERNEL_RCSID(0, "$NetBSD: ip6_output.c,v 1.220.2.2 2023/08/04 14:29:44 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@ -170,6 +170,12 @@ ip6_if_output(struct ifnet * const ifp, struct ifnet * const origifp,
}
}
/* discard the packet if IPv6 operation is disabled on the interface */
if ((ND_IFINFO(ifp)->flags & ND6_IFF_IFDISABLED)) {
m_freem(m);
return ENETDOWN; /* better error? */
}
if ((ifp->if_flags & IFF_LOOPBACK) != 0)
error = if_output_lock(ifp, origifp, m, sin6tocsa(dst), rt);
else