CVS commit: src/sys/dev/ic

[Nick Hudson]

Module Name:    src
Committed By:   skrll
Date:           Sun Oct  6 19:34:07 UTC 2024

Modified Files:
        src/sys/dev/ic: bcmgenet.c

Log Message:
Don't use obsoleted if_flags / IFF_ALLMULTI instead set / clear
ec_flags / ETHER_F_ALLMULTI.


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/dev/ic/bcmgenet.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/dev/ic/bcmgenet.c
diff -u src/sys/dev/ic/bcmgenet.c:1.21 src/sys/dev/ic/bcmgenet.c:1.22
--- src/sys/dev/ic/bcmgenet.c:1.21	Fri Oct  4 10:41:58 2024
+++ src/sys/dev/ic/bcmgenet.c	Sun Oct  6 19:34:06 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: bcmgenet.c,v 1.21 2024/10/04 10:41:58 skrll Exp $ */
+/* $NetBSD: bcmgenet.c,v 1.22 2024/10/06 19:34:06 skrll Exp $ */
 
 /*-
  * Copyright (c) 2020 Jared McNeill <jmcne...@invisible.ca>
@@ -33,7 +33,7 @@
 #include "opt_ddb.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bcmgenet.c,v 1.21 2024/10/04 10:41:58 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcmgenet.c,v 1.22 2024/10/06 19:34:06 skrll Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -360,11 +360,12 @@ genet_setup_rxfilter(struct genet_softc 
 		ETHER_NEXT_MULTI(step, enm);
 
 	if (n > GENET_MAX_MDF_FILTER)
-		ifp->if_flags |= IFF_ALLMULTI;
+		ec->ec_flags |= ETHER_F_ALLMULTI;
 	else
-		ifp->if_flags &= ~IFF_ALLMULTI;
+		ec->ec_flags &= ~ETHER_F_ALLMULTI;
 
-	if ((ifp->if_flags & (IFF_PROMISC|IFF_ALLMULTI)) != 0) {
+	if ((sc->sc_if_flags & IFF_PROMISC) != 0) {
+		ec->ec_flags |= ETHER_F_ALLMULTI;
 		cmd |= GENET_UMAC_CMD_PROMISC;
 		mdf_ctrl = 0;
 	} else {
@@ -945,7 +946,7 @@ genet_ifflags_cb(struct ethercom *ec)
 
 	if ((change & ~(IFF_CANTCHANGE | IFF_DEBUG)) != 0) {
 		ret = ENETRESET;
-	} else if ((change & (IFF_PROMISC | IFF_ALLMULTI)) != 0) {
+	} else if ((change & IFF_PROMISC) != 0) {
 		if ((sc->sc_if_flags & IFF_RUNNING) != 0)
 			genet_setup_rxfilter(sc);
 	}