Module Name: src
Committed By: yamaguchi
Date: Tue Oct 12 08:30:58 UTC 2021
Modified Files:
src/sys/net/lagg: if_lagg.c if_laggproto.h
Log Message:
Set a port interface of lagg(4) in promiscuous mode
when the lagg(4) is in promiscuous mode.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/net/lagg/if_lagg.c
cvs rdiff -u -r1.7 -r1.8 src/sys/net/lagg/if_laggproto.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/lagg/if_lagg.c
diff -u src/sys/net/lagg/if_lagg.c:1.12 src/sys/net/lagg/if_lagg.c:1.13
--- src/sys/net/lagg/if_lagg.c:1.12 Tue Oct 12 08:26:47 2021
+++ src/sys/net/lagg/if_lagg.c Tue Oct 12 08:30:58 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: if_lagg.c,v 1.12 2021/10/12 08:26:47 yamaguchi Exp $ */
+/* $NetBSD: if_lagg.c,v 1.13 2021/10/12 08:30:58 yamaguchi Exp $ */
/*
* Copyright (c) 2005, 2006 Reyk Floeter <[email protected]>
@@ -20,7 +20,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_lagg.c,v 1.12 2021/10/12 08:26:47 yamaguchi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_lagg.c,v 1.13 2021/10/12 08:30:58 yamaguchi Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -180,6 +180,7 @@ static int lagg_port_ioctl(struct ifnet
static int lagg_port_output(struct ifnet *, struct mbuf *,
const struct sockaddr *, const struct rtentry *);
static int lagg_config_promisc(struct lagg_softc *, struct lagg_port *);
+static void lagg_unconfig_promisc(struct lagg_softc *, struct lagg_port *);
static struct lagg_variant *
lagg_variant_getref(struct lagg_softc *, struct psref *);
static void lagg_variant_putref(struct lagg_variant *, struct psref *);
@@ -2287,6 +2288,7 @@ lagg_port_setup(struct lagg_softc *sc,
goto remove_port;
}
+ lagg_config_promisc(sc, lp);
lagg_proto_startport(sc, lp);
lagg_capabilities_update(sc);
@@ -2390,6 +2392,7 @@ lagg_port_teardown(struct lagg_softc *sc
}
if (is_ifdetach == false) {
+ lagg_unconfig_promisc(sc, lp);
lagg_setifcaps(lp, lp->lp_ifcapenable);
if (lp->lp_iftype == IFT_ETHER)
lagg_setethcaps(lp, lp->lp_eccapenable);
@@ -2543,17 +2546,38 @@ static int
lagg_config_promisc(struct lagg_softc *sc, struct lagg_port *lp)
{
struct ifnet *ifp;
+ uint64_t chg_flags;
int error;
- int status;
+ error = 0;
ifp = &sc->sc_if;
- status = ISSET(ifp->if_flags, IFF_PROMISC) ? 1 : 0;
+ chg_flags = ifp->if_flags ^ lp->lp_ifflags;
- error = ifpromisc(lp->lp_ifp, status);
+ if (ISSET(chg_flags, IFF_PROMISC)) {
+ error = ifpromisc(lp->lp_ifp,
+ ISSET(ifp->if_flags, IFF_PROMISC) ? 1 : 0);
+ if (error == 0) {
+ lp->lp_ifflags ^= IFF_PROMISC;
+ }
+ }
return error;
}
+static void
+lagg_unconfig_promisc(struct lagg_softc *sc, struct lagg_port *lp)
+{
+ int error;
+
+ if (ISSET(lp->lp_ifflags, IFF_PROMISC)) {
+ error = ifpromisc(lp->lp_ifp, 0);
+ if (error != 0) {
+ lagg_log(sc, LOG_DEBUG,
+ "couldn't unset promiscuous mode");
+ }
+ }
+}
+
static int
lagg_port_ioctl(struct ifnet *ifp, u_long cmd, void *data)
{
Index: src/sys/net/lagg/if_laggproto.h
diff -u src/sys/net/lagg/if_laggproto.h:1.7 src/sys/net/lagg/if_laggproto.h:1.8
--- src/sys/net/lagg/if_laggproto.h:1.7 Tue Oct 12 08:26:47 2021
+++ src/sys/net/lagg/if_laggproto.h Tue Oct 12 08:30:58 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: if_laggproto.h,v 1.7 2021/10/12 08:26:47 yamaguchi Exp $ */
+/* $NetBSD: if_laggproto.h,v 1.8 2021/10/12 08:30:58 yamaguchi Exp $ */
/*
* Copyright (c) 2021 Internet Initiative Japan Inc.
@@ -76,6 +76,7 @@ struct lagg_port {
u_char lp_iftype;
uint8_t lp_lladdr[ETHER_ADDR_LEN];
+ unsigned short lp_ifflags;
int lp_eccapenable;
uint64_t lp_ifcapenable;
uint64_t lp_mtu;
