Module Name: src
Committed By: roy
Date: Fri Sep 11 15:01:27 UTC 2020
Modified Files:
src/sys/net: if_llatbl.c
Log Message:
if_llatbl.c: adjust for nd changes
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/net/if_llatbl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/if_llatbl.c
diff -u src/sys/net/if_llatbl.c:1.31 src/sys/net/if_llatbl.c:1.32
--- src/sys/net/if_llatbl.c:1.31 Wed Sep 25 09:53:37 2019
+++ src/sys/net/if_llatbl.c Fri Sep 11 15:01:26 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_llatbl.c,v 1.31 2019/09/25 09:53:37 ozaki-r Exp $ */
+/* $NetBSD: if_llatbl.c,v 1.32 2020/09/11 15:01:26 roy Exp $ */
/*
* Copyright (c) 2004 Luigi Rizzo, Alessandro Cerri. All rights reserved.
* Copyright (c) 2004-2008 Qing Li. All rights reserved.
@@ -59,11 +59,11 @@
#include <net/if_llatbl.h>
#include <net/if.h>
#include <net/if_dl.h>
+#include <net/nd.h>
#include <net/route.h>
#include <netinet/if_inarp.h>
#include <netinet/in_var.h>
#include <netinet6/in6_var.h>
-#include <netinet6/nd6.h>
static SLIST_HEAD(, lltable) lltables;
krwlock_t lltable_rwlock;
@@ -716,13 +716,14 @@ lla_rt_output(const u_char rtm_type, con
if ((rtm_flags & RTF_ANNOUNCE))
lle->la_flags |= LLE_PUB;
lle->la_flags |= LLE_VALID;
+ switch (dst->sa_family) {
#ifdef INET6
- /*
- * ND6
- */
- if (dst->sa_family == AF_INET6)
- lle->ln_state = ND6_LLINFO_REACHABLE;
+ case AF_INET6:
+ lle->ln_state = ND_LLINFO_REACHABLE;
+ break;
#endif
+ }
+
/*
* NB: arp and ndp always set (RTF_STATIC | RTF_HOST)
*/
