svn commit: r308348 - head/usr.sbin/rtadvd

[Hiroki Sato]

Author: hrs
Date: Sat Nov  5 19:51:13 2016
New Revision: 308348
URL: https://svnweb.freebsd.org/changeset/base/308348

Log:
  Add link-layer address option in RA even for IFT_L2VLAN and IFT_BRIDGE.
  
  Reported by:	philip
  MFC after:	3 days

Modified:
  head/usr.sbin/rtadvd/if.c

Modified: head/usr.sbin/rtadvd/if.c
==============================================================================
--- head/usr.sbin/rtadvd/if.c	Sat Nov  5 18:00:36 2016	(r308347)
+++ head/usr.sbin/rtadvd/if.c	Sat Nov  5 19:51:13 2016	(r308348)
@@ -114,6 +114,8 @@ lladdropt_length(struct sockaddr_dl *sdl
 {
 	switch (sdl->sdl_type) {
 	case IFT_ETHER:
+	case IFT_L2VLAN:
+	case IFT_BRIDGE:
 		return (ROUNDUP8(ETHER_ADDR_LEN + 2));
 	default:
 		return (0);
@@ -129,6 +131,8 @@ lladdropt_fill(struct sockaddr_dl *sdl, 
 
 	switch (sdl->sdl_type) {
 	case IFT_ETHER:
+	case IFT_L2VLAN:
+	case IFT_BRIDGE:
 		ndopt->nd_opt_len = (ROUNDUP8(ETHER_ADDR_LEN + 2)) >> 3;
 		addr = (char *)(ndopt + 1);
 		memcpy(addr, LLADDR(sdl), ETHER_ADDR_LEN);