CVS commit: src/sys/dev/cadence

[Nick Hudson]

Module Name:    src
Committed By:   skrll
Date:           Sun Sep 29 09:13:14 UTC 2024

Modified Files:
        src/sys/dev/cadence: if_cemac.c if_cemacvar.h

Log Message:
Rename a softc member. NFC.


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/sys/dev/cadence/if_cemac.c
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/cadence/if_cemacvar.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/dev/cadence/if_cemac.c
diff -u src/sys/dev/cadence/if_cemac.c:1.41 src/sys/dev/cadence/if_cemac.c:1.42
--- src/sys/dev/cadence/if_cemac.c:1.41	Sun Sep 29 08:55:21 2024
+++ src/sys/dev/cadence/if_cemac.c	Sun Sep 29 09:13:14 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_cemac.c,v 1.41 2024/09/29 08:55:21 skrll Exp $	*/
+/*	$NetBSD: if_cemac.c,v 1.42 2024/09/29 09:13:14 skrll Exp $	*/
 
 /*
  * Copyright (c) 2015  Genetec Corporation.  All rights reserved.
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_cemac.c,v 1.41 2024/09/29 08:55:21 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cemac.c,v 1.42 2024/09/29 09:13:14 skrll Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
@@ -197,8 +197,8 @@ cemac_gctx(struct cemac_softc *sc)
 	}
 
 	// mark we're free
-	if (sc->tx_busy) {
-		sc->tx_busy = false;
+	if (sc->sc_txbusy) {
+		sc->sc_txbusy = false;
 		/* Disable transmit-buffer-free interrupt */
 		/*CEMAC_WRITE(ETH_IDR, ETH_ISR_TBRE);*/
 	}
@@ -725,7 +725,7 @@ start:
 	if (cemac_gctx(sc) == 0) {
 		/* Enable transmit-buffer-free interrupt */
 		CEMAC_WRITE(ETH_IER, ETH_ISR_TBRE);
-		sc->tx_busy = true;
+		sc->sc_txbusy = true;
 		ifp->if_timer = 10;
 		splx(s);
 		return;
@@ -908,7 +908,7 @@ cemac_ifstop(struct ifnet *ifp, int disa
 
 	ifp->if_flags &= ~IFF_RUNNING;
 	ifp->if_timer = 0;
-	sc->tx_busy = false;
+	sc->sc_txbusy = false;
 	sc->sc_mii.mii_media_status &= ~IFM_ACTIVE;
 }
 

Index: src/sys/dev/cadence/if_cemacvar.h
diff -u src/sys/dev/cadence/if_cemacvar.h:1.4 src/sys/dev/cadence/if_cemacvar.h:1.5
--- src/sys/dev/cadence/if_cemacvar.h:1.4	Sun Aug 25 07:25:00 2024
+++ src/sys/dev/cadence/if_cemacvar.h	Sun Sep 29 09:13:14 2024
@@ -1,4 +1,4 @@
-/*      $NetBSD: if_cemacvar.h,v 1.4 2024/08/25 07:25:00 skrll Exp $	*/
+/*      $NetBSD: if_cemacvar.h,v 1.5 2024/09/29 09:13:14 skrll Exp $	*/
 /*-
  * Copyright (c) 2015  Genetec Corporation.  All rights reserved.
  * Written by Hashimoto Kenichi for Genetec Corporation.
@@ -68,10 +68,11 @@ struct cemac_softc {
 	int			txqi, txqc;
 	struct cemac_qmeta	txq[TX_QLEN];
 	callout_t		cemac_tick_ch;
-	bool			tx_busy;
 
 	unsigned		cemac_flags;
 #define CEMAC_FLAG_GEM	__BIT(0)
+
+	bool			sc_txbusy;
 };
 
 int cemac_intr(void *);