Module Name: src
Committed By: skrll
Date: Thu Dec 21 08:50:22 UTC 2023
Modified Files:
src/sys/dev/pci: if_rge.c if_rgereg.h
Log Message:
G/C sc_task and #include "opt_net_mpsafe.h"
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/dev/pci/if_rge.c
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/pci/if_rgereg.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/pci/if_rge.c
diff -u src/sys/dev/pci/if_rge.c:1.29 src/sys/dev/pci/if_rge.c:1.30
--- src/sys/dev/pci/if_rge.c:1.29 Sat Dec 16 16:35:49 2023
+++ src/sys/dev/pci/if_rge.c Thu Dec 21 08:50:22 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: if_rge.c,v 1.29 2023/12/16 16:35:49 mlelstv Exp $ */
+/* $NetBSD: if_rge.c,v 1.30 2023/12/21 08:50:22 skrll Exp $ */
/* $OpenBSD: if_rge.c,v 1.9 2020/12/12 11:48:53 jan Exp $ */
/*
@@ -18,7 +18,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_rge.c,v 1.29 2023/12/16 16:35:49 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_rge.c,v 1.30 2023/12/21 08:50:22 skrll Exp $");
+
+#if defined(_KERNEL_OPT)
+#include "opt_net_mpsafe.h"
+#endif
#include <sys/types.h>
@@ -144,7 +148,7 @@ uint16_t rge_read_phy(struct rge_softc *
void rge_write_phy_ocp(struct rge_softc *, uint16_t, uint16_t);
uint16_t rge_read_phy_ocp(struct rge_softc *, uint16_t);
int rge_get_link_status(struct rge_softc *);
-void rge_txstart(struct work *, void *);
+void rge_txstart(void *);
void rge_tick(void *);
void rge_link_state(struct rge_softc *);
@@ -629,11 +633,7 @@ rge_start(struct ifnet *ifp)
ifp->if_timer = 5;
sc->rge_ldata.rge_txq_prodidx = idx;
-#if 0
- ifq_serialize(ifq, &sc->sc_task);
-#else
- rge_txstart(&sc->sc_task, sc);
-#endif
+ rge_txstart(sc);
}
void
@@ -1410,7 +1410,7 @@ rge_txeof(struct rge_softc *sc)
sc->rge_ldata.rge_txq_considx = cons;
if (free == 2)
- rge_txstart(&sc->sc_task, sc);
+ rge_txstart(sc);
CLR(ifp->if_flags, IFF_OACTIVE);
ifp->if_timer = 0;
@@ -2455,7 +2455,7 @@ rge_get_link_status(struct rge_softc *sc
}
void
-rge_txstart(struct work *wk, void *arg)
+rge_txstart(void *arg)
{
struct rge_softc *sc = arg;
Index: src/sys/dev/pci/if_rgereg.h
diff -u src/sys/dev/pci/if_rgereg.h:1.7 src/sys/dev/pci/if_rgereg.h:1.8
--- src/sys/dev/pci/if_rgereg.h:1.7 Wed Dec 21 05:19:15 2022
+++ src/sys/dev/pci/if_rgereg.h Thu Dec 21 08:50:22 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: if_rgereg.h,v 1.7 2022/12/21 05:19:15 nonaka Exp $ */
+/* $NetBSD: if_rgereg.h,v 1.8 2023/12/21 08:50:22 skrll Exp $ */
/* $OpenBSD: if_rgereg.h,v 1.6 2020/12/24 01:00:00 kevlo Exp $ */
/*
@@ -359,8 +359,6 @@ struct rge_softc {
struct rge_list_data rge_ldata;
- struct work sc_task;
-
callout_t sc_timeout; /* tick timeout */
uint8_t sc_enaddr[ETHER_ADDR_LEN];
