svn commit: r308717 - stable/10/usr.sbin/rtadvd

[Hiroki Sato]

Author: hrs
Date: Wed Nov 16 03:54:41 2016
New Revision: 308717
URL: https://svnweb.freebsd.org/changeset/base/308717

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

Modified:
  stable/10/usr.sbin/rtadvd/if.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.sbin/rtadvd/if.c
==============================================================================
--- stable/10/usr.sbin/rtadvd/if.c	Wed Nov 16 03:54:30 2016	(r308716)
+++ stable/10/usr.sbin/rtadvd/if.c	Wed Nov 16 03:54:41 2016	(r308717)
@@ -115,6 +115,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);
@@ -130,6 +132,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);