The branch stable/13 has been updated by melifaro:
URL:
https://cgit.FreeBSD.org/src/commit/?id=9abc85d17d0538704641fe2c4d9da1b666f86e4e
commit 9abc85d17d0538704641fe2c4d9da1b666f86e4e
Author: Alexander V. Chernikov <melif...@freebsd.org>
AuthorDate: 2021-04-11 16:47:03 +0000
Commit: Alexander V. Chernikov <melif...@freebsd.org>
CommitDate: 2021-04-12 22:18:33 +0000
Fix vlan creation for the older ifconfig(8) binaries.
Reported by: allanjude
MFC after: immediately
(cherry picked from commit afbb64f1d85b7d8c2938031c3567946b5d10da4f)
---
sys/net/if_vlan.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c
index 2f48a5aa2f56..40b042b56248 100644
--- a/sys/net/if_vlan.c
+++ b/sys/net/if_vlan.c
@@ -1012,6 +1012,10 @@ vlan_clone_create(struct if_clone *ifc, char *name,
size_t len, caddr_t params)
vid = vlr.vlr_tag;
proto = vlr.vlr_proto;
+#ifdef COMPAT_FREEBSD12
+ if (proto == 0)
+ proto = ETHERTYPE_VLAN;
+#endif
p = ifunit_ref(vlr.vlr_parent);
if (p == NULL)
return (ENXIO);
@@ -1942,6 +1946,10 @@ vlan_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
error = ENOENT;
break;
}
+#ifdef COMPAT_FREEBSD12
+ if (vlr.vlr_proto == 0)
+ vlr.vlr_proto = ETHERTYPE_VLAN;
+#endif
oldmtu = ifp->if_mtu;
error = vlan_config(ifv, p, vlr.vlr_tag, vlr.vlr_proto);
if_rele(p);
_______________________________________________
dev-commits-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-all
To unsubscribe, send any mail to "dev-commits-src-all-unsubscr...@freebsd.org"
