diff -u --label /home/riastradh/netbsd/hg/src/sys/dev/ic/bwi.c --label \#\<buffer\ bwi.c\> /home/riastradh/netbsd/hg/src/sys/dev/ic/bwi.c /tmp/riastradh/buffer-content-39RC0Q
--- /home/riastradh/netbsd/hg/src/sys/dev/ic/bwi.c
+++ #<buffer bwi.c>
@@ -719,7 +719,7 @@
 	struct bwi_softc *sc = arg;
 	struct bwi_mac *mac;
 	struct ifnet *ifp = &sc->sc_if;
-	uint32_t intr_status, intr_mask;
+	uint32_t intr_status;
 	uint32_t txrx_intr_status[BWI_TXRX_NRING];
 	int i, s, txrx_error, tx = 0, rx_data = -1;
 
@@ -735,16 +735,8 @@
 		if (intr_status == 0xffffffff)	/* Not for us */
 			goto out;
 
-		if (BWI_IS_SDIO(sc)) {
-			intr_mask = 0xffffffff;
-		} else {
-			/* XXX FIXME */
-			intr_mask = CSR_READ_4(sc, BWI_MAC_INTR_MASK);
-		}
-		DPRINTF(sc, BWI_DBG_INTR,
-		    "intr status 0x%08x mask 0x%08x -> 0x%08x\n",
-		    intr_status, intr_mask, intr_status & intr_mask);
-		intr_status &= intr_mask;
+		DPRINTF(sc, BWI_DBG_INTR, "intr status 0x%08x\n", intr_status);
+		intr_status &= BWI_INIT_INTRS;
 		if (intr_status == 0) {		/* Nothing is interesting */
 			goto out;
 		}

Diff finished.  Tue Feb 18 23:30:20 2025