git: 56a4e77d461e - stable/12 - rtsold: make it work on if_vlan interfaces

Kristof Provost kp at FreeBSD.org
Thu Aug 26 12:06:36 UTC 2021


The branch stable/12 has been updated by kp:

URL: https://cgit.FreeBSD.org/src/commit/?id=56a4e77d461e3d4ad9b95afe9bb847cb7573075e

commit 56a4e77d461e3d4ad9b95afe9bb847cb7573075e
Author:     Luiz Otavio O Souza <loos at FreeBSD.org>
AuthorDate: 2021-08-19 09:48:04 +0000
Commit:     Kristof Provost <kp at FreeBSD.org>
CommitDate: 2021-08-26 07:26:49 +0000

    rtsold: make it work on if_vlan interfaces
    
    Reviewed by:    kp
    Obtained from:  pfsense
    MFC after:      1 week
    
    (cherry picked from commit 1a4d7030bbfec0f830e87bf7c2810f049f8ca8ac)
---
 usr.sbin/rtsold/if.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/usr.sbin/rtsold/if.c b/usr.sbin/rtsold/if.c
index b2f2c640b175..0f7f2ce7cba5 100644
--- a/usr.sbin/rtsold/if.c
+++ b/usr.sbin/rtsold/if.c
@@ -262,6 +262,7 @@ lladdropt_length(struct sockaddr_dl *sdl)
 {
 	switch (sdl->sdl_type) {
 	case IFT_ETHER:
+	case IFT_L2VLAN:
 		return (ROUNDUP8(ETHER_ADDR_LEN + 2));
 	default:
 		return (0);
@@ -277,6 +278,7 @@ lladdropt_fill(struct sockaddr_dl *sdl, struct nd_opt_hdr *ndopt)
 
 	switch (sdl->sdl_type) {
 	case IFT_ETHER:
+	case IFT_L2VLAN:
 		ndopt->nd_opt_len = (ROUNDUP8(ETHER_ADDR_LEN + 2)) >> 3;
 		addr = (char *)(ndopt + 1);
 		memcpy(addr, LLADDR(sdl), ETHER_ADDR_LEN);


More information about the dev-commits-src-branches mailing list