summaryrefslogtreecommitdiffstats
path: root/sys/netinet6
diff options
context:
space:
mode:
authorbrooks <brooks@FreeBSD.org>2005-06-12 00:45:24 +0000
committerbrooks <brooks@FreeBSD.org>2005-06-12 00:45:24 +0000
commit547b8204c4d8709df43333108aacf7cd762d1dac (patch)
tree63d188d154d5b95b0181423b95f36464a72ee78c /sys/netinet6
parentc8414d76dddb1bfbc678cde7a6a7d6b0ab3216af (diff)
downloadFreeBSD-src-547b8204c4d8709df43333108aacf7cd762d1dac.zip
FreeBSD-src-547b8204c4d8709df43333108aacf7cd762d1dac.tar.gz
Fix IPv6 neighbor discovery by using IF_LLADDR to get the mac address
instead of a particularly ugly cast + pointer math hack. Reported by: kuriyama, kris
Diffstat (limited to 'sys/netinet6')
-rw-r--r--sys/netinet6/nd6_nbr.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/netinet6/nd6_nbr.c b/sys/netinet6/nd6_nbr.c
index e428bd4..b2b3c30 100644
--- a/sys/netinet6/nd6_nbr.c
+++ b/sys/netinet6/nd6_nbr.c
@@ -51,6 +51,7 @@
#include <net/if.h>
#include <net/if_types.h>
#include <net/if_dl.h>
+#include <net/if_var.h>
#include <net/route.h>
#include <netinet/in.h>
@@ -967,7 +968,7 @@ nd6_ifptomac(ifp)
case IFT_CARP:
#endif
case IFT_ISO88025:
- return ((caddr_t)(ifp + 1));
+ return IF_LLADDR(ifp);
default:
return NULL;
}
OpenPOWER on IntegriCloud