summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorjhb <jhb@FreeBSD.org>2005-07-21 16:42:21 +0000
committerjhb <jhb@FreeBSD.org>2005-07-21 16:42:21 +0000
commit85a0e8deb13950394fa190199b688d7230b3ca6a (patch)
treecc4db958911fa6953aa2a3a77f6fc16456990b44 /sys
parent64b47851159b469193df993eabe2cd3fab7d9f73 (diff)
downloadFreeBSD-src-85a0e8deb13950394fa190199b688d7230b3ca6a.zip
FreeBSD-src-85a0e8deb13950394fa190199b688d7230b3ca6a.tar.gz
Don't set if_start to tulip_ifstart all over the place. It is already
set in tulip_attach() and its value is never changed, so all the extra sets are redundant. I'm guessing that at some point in time de(4) had an alternate start routine, but that hasn't been true in recent history.
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/de/if_de.c6
-rw-r--r--sys/pci/if_de.c6
2 files changed, 0 insertions, 12 deletions
diff --git a/sys/dev/de/if_de.c b/sys/dev/de/if_de.c
index c067f3e..55f746e 100644
--- a/sys/dev/de/if_de.c
+++ b/sys/dev/de/if_de.c
@@ -2974,7 +2974,6 @@ tulip_addr_filter(
multicnt++;
}
- sc->tulip_ifp->if_start = tulip_ifstart; /* so the setup packet gets queued */
if (multicnt > 14) {
u_int32_t *sp = sc->tulip_setupdata;
unsigned hash;
@@ -3124,7 +3123,6 @@ tulip_reset(
sc->tulip_flags |= TULIP_INRESET;
sc->tulip_flags &= ~(TULIP_NEEDRESET|TULIP_RXBUFSLOW);
sc->tulip_ifp->if_flags &= ~IFF_OACTIVE;
- sc->tulip_ifp->if_start = tulip_ifstart;
}
#if defined(TULIP_BUS_DMA) && !defined(TULIP_BUS_DMA_NOTX)
@@ -4206,7 +4204,6 @@ tulip_txput(
if (sc->tulip_flags & TULIP_TXPROBE_ACTIVE) {
TULIP_CSR_WRITE(sc, csr_txpoll, 1);
sc->tulip_ifp->if_flags |= IFF_OACTIVE;
- sc->tulip_ifp->if_start = tulip_ifstart;
TULIP_PERFEND(txput);
return NULL;
}
@@ -4236,7 +4233,6 @@ tulip_txput(
#endif
if (sc->tulip_flags & (TULIP_WANTTXSTART|TULIP_DOINGSETUP)) {
sc->tulip_ifp->if_flags |= IFF_OACTIVE;
- sc->tulip_ifp->if_start = tulip_ifstart;
if ((sc->tulip_intrmask & TULIP_STS_TXINTR) == 0) {
sc->tulip_intrmask |= TULIP_STS_TXINTR;
TULIP_CSR_WRITE(sc, csr_intr, sc->tulip_intrmask);
@@ -4267,7 +4263,6 @@ tulip_txput_setup(
if ((sc->tulip_cmdmode & TULIP_CMD_TXRUN) == 0) {
if_printf(sc->tulip_ifp, "txput_setup: tx not running\n");
sc->tulip_flags |= TULIP_WANTTXSTART;
- sc->tulip_ifp->if_start = tulip_ifstart;
return;
}
#endif
@@ -4278,7 +4273,6 @@ tulip_txput_setup(
tulip_tx_intr(sc);
if ((sc->tulip_flags & TULIP_DOINGSETUP) || ri->ri_free == 1) {
sc->tulip_flags |= TULIP_WANTTXSTART;
- sc->tulip_ifp->if_start = tulip_ifstart;
return;
}
bcopy(sc->tulip_setupdata, sc->tulip_setupbuf,
diff --git a/sys/pci/if_de.c b/sys/pci/if_de.c
index c067f3e..55f746e 100644
--- a/sys/pci/if_de.c
+++ b/sys/pci/if_de.c
@@ -2974,7 +2974,6 @@ tulip_addr_filter(
multicnt++;
}
- sc->tulip_ifp->if_start = tulip_ifstart; /* so the setup packet gets queued */
if (multicnt > 14) {
u_int32_t *sp = sc->tulip_setupdata;
unsigned hash;
@@ -3124,7 +3123,6 @@ tulip_reset(
sc->tulip_flags |= TULIP_INRESET;
sc->tulip_flags &= ~(TULIP_NEEDRESET|TULIP_RXBUFSLOW);
sc->tulip_ifp->if_flags &= ~IFF_OACTIVE;
- sc->tulip_ifp->if_start = tulip_ifstart;
}
#if defined(TULIP_BUS_DMA) && !defined(TULIP_BUS_DMA_NOTX)
@@ -4206,7 +4204,6 @@ tulip_txput(
if (sc->tulip_flags & TULIP_TXPROBE_ACTIVE) {
TULIP_CSR_WRITE(sc, csr_txpoll, 1);
sc->tulip_ifp->if_flags |= IFF_OACTIVE;
- sc->tulip_ifp->if_start = tulip_ifstart;
TULIP_PERFEND(txput);
return NULL;
}
@@ -4236,7 +4233,6 @@ tulip_txput(
#endif
if (sc->tulip_flags & (TULIP_WANTTXSTART|TULIP_DOINGSETUP)) {
sc->tulip_ifp->if_flags |= IFF_OACTIVE;
- sc->tulip_ifp->if_start = tulip_ifstart;
if ((sc->tulip_intrmask & TULIP_STS_TXINTR) == 0) {
sc->tulip_intrmask |= TULIP_STS_TXINTR;
TULIP_CSR_WRITE(sc, csr_intr, sc->tulip_intrmask);
@@ -4267,7 +4263,6 @@ tulip_txput_setup(
if ((sc->tulip_cmdmode & TULIP_CMD_TXRUN) == 0) {
if_printf(sc->tulip_ifp, "txput_setup: tx not running\n");
sc->tulip_flags |= TULIP_WANTTXSTART;
- sc->tulip_ifp->if_start = tulip_ifstart;
return;
}
#endif
@@ -4278,7 +4273,6 @@ tulip_txput_setup(
tulip_tx_intr(sc);
if ((sc->tulip_flags & TULIP_DOINGSETUP) || ri->ri_free == 1) {
sc->tulip_flags |= TULIP_WANTTXSTART;
- sc->tulip_ifp->if_start = tulip_ifstart;
return;
}
bcopy(sc->tulip_setupdata, sc->tulip_setupbuf,
OpenPOWER on IntegriCloud