add support for setting and getting bridge port flags.

1 files changed, 48 insertions, 1 deletions

diff --git a/sys/net/if_veb.c b/sys/net/if_veb.c
index 7cb9c91a616..e9b0a2fd8bb 100644
--- a/sys/net/if_veb.c
+++ b/sys/net/if_veb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_veb.c,v 1.2 2021/02/23 04:40:27 dlg Exp $ */
+/*	$OpenBSD: if_veb.c,v 1.3 2021/02/23 05:01:00 dlg Exp $ */
 
 /*
  * Copyright (c) 2021 David Gwynne <dlg@openbsd.org>
@@ -69,6 +69,9 @@ static const union veb_addr veb_8021_group_mask = {
 	.ea = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0 }
 };
 
+/* SIOCBRDGIFFLGS, SIOCBRDGIFFLGS */
+#define VEB_IFBIF_FLAGS	(IFBIF_LEARNING|IFBIF_DISCOVER)
+
 struct veb_rule {
 	TAILQ_ENTRY(veb_rule)		vr_entry;
 	SMR_TAILQ_ENTRY(veb_rule)	vr_lentry[2];
@@ -185,6 +188,8 @@ static int	veb_add_port(struct veb_softc *,
 static int	veb_del_port(struct veb_softc *,
 		    const struct ifbreq *, unsigned int);
 static int	veb_port_list(struct veb_softc *, struct ifbifconf *);
+static int	veb_port_set_flags(struct veb_softc *, struct ifbreq *);
+static int	veb_port_get_flags(struct veb_softc *, struct ifbreq *);
 static int	veb_port_set_protected(struct veb_softc *,
 		    const struct ifbreq *);
 
@@ -835,6 +840,13 @@ veb_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 		error = veb_port_set_protected(sc, (struct ifbreq *)data);
 		break;
 
+	case SIOCBRDGSIFFLGS:
+		error = veb_port_set_flags(sc, (struct ifbreq *)data);
+		break;
+	case SIOCBRDGGIFFLGS:
+		error = veb_port_get_flags(sc, (struct ifbreq *)data);
+		break;
+
 	case SIOCBRDGARL:
 		error = veb_rule_add(sc, (struct ifbrlreq *)data);
 		break;
@@ -1372,6 +1384,41 @@ done:
 }
 
 static int
+veb_port_set_flags(struct veb_softc *sc, struct ifbreq *ifbr)
+{
+	struct veb_port *p;
+
+	if (ISSET(ifbr->ifbr_ifsflags, ~VEB_IFBIF_FLAGS))
+		return (EINVAL);
+
+	p = veb_port_get(sc, ifbr->ifbr_ifsname);
+	if (p == NULL)
+		return (ESRCH);
+
+	p->p_bif_flags = ifbr->ifbr_ifsflags;
+
+	veb_port_put(sc, p);
+	return (0);
+}
+
+static int
+veb_port_get_flags(struct veb_softc *sc, struct ifbreq *ifbr)
+{
+	struct veb_port *p;
+
+	p = veb_port_get(sc, ifbr->ifbr_ifsname);
+	if (p == NULL)
+		return (ESRCH);
+
+	ifbr->ifbr_ifsflags = p->p_bif_flags;
+	ifbr->ifbr_portno = p->p_ifp0->if_index;
+	ifbr->ifbr_protected = p->p_protected;
+
+	veb_port_put(sc, p);
+	return (0);
+}
+
+static int
 veb_p_ioctl(struct ifnet *ifp0, u_long cmd, caddr_t data)
 {
 	const struct ether_brport *eb = ether_brport_get_locked(ifp0);