diff options
| author | gj <gj@FreeBSD.org> | 2002-01-02 12:55:04 +0000 |
|---|---|---|
| committer | gj <gj@FreeBSD.org> | 2002-01-02 12:55:04 +0000 |
| commit | dbe2ffb19b80f86008bc5f021f55be1b6c8c6f4c (patch) | |
| tree | 94bb5ef87657fa7c447a6e64c1f6071c875a7670 /sys/i4b | |
| parent | aa1c1654e02a5749efcc45a9a47ebc481f55f6f1 (diff) | |
| download | FreeBSD-src-dbe2ffb19b80f86008bc5f021f55be1b6c8c6f4c.zip FreeBSD-src-dbe2ffb19b80f86008bc5f021f55be1b6c8c6f4c.tar.gz | |
Fix some places where the macro L0IFPIUNIT was used instead of the correct
form L0IFPI2UNIT. This could result in a panic if the user tried to
trace using isdntrace(8). I fixed this locally but forgot to commit it.
Reminded by: "Wittig, Christoph" <wc@medianet-world.de>
Diffstat (limited to 'sys/i4b')
| -rw-r--r-- | sys/i4b/layer1/ifpi2/i4b_ifpi2_l1.c | 4 | ||||
| -rw-r--r-- | sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1.c b/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1.c index 60838f6..671e4eb 100644 --- a/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1.c +++ b/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1.c @@ -116,7 +116,7 @@ ifpi2_ph_data_req(int unit, struct mbuf *m, int freeflag) if(sc->sc_trace & TRACE_D_TX) { i4b_trace_hdr_t hdr; - hdr.unit = L0IFPIUNIT(unit); + hdr.unit = L0IFPI2UNIT(unit); hdr.type = TRC_CH_D; hdr.dir = FROM_TE; hdr.count = ++sc->sc_trace_dcount; @@ -139,7 +139,7 @@ ifpi2_ph_data_req(int unit, struct mbuf *m, int freeflag) if(sc->sc_trace & TRACE_D_TX) { i4b_trace_hdr_t hdr; - hdr.unit = L0IFPIUNIT(unit); + hdr.unit = L0IFPI2UNIT(unit); hdr.type = TRC_CH_D; hdr.dir = FROM_TE; hdr.count = ++sc->sc_trace_dcount; diff --git a/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c b/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c index f0bc413..01794f3 100644 --- a/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c +++ b/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c @@ -748,7 +748,7 @@ avma1pp2_hscx_intr(int h_chan, u_int stat, struct l1_softc *sc) if(sc->sc_trace & TRACE_B_RX) { i4b_trace_hdr_t hdr; - hdr.unit = L0IFPIUNIT(sc->sc_unit); + hdr.unit = L0IFPI2UNIT(sc->sc_unit); hdr.type = (h_chan == HSCX_CH_A ? TRC_CH_B1 : TRC_CH_B2); hdr.dir = FROM_NT; hdr.count = ++sc->sc_trace_bcount; @@ -795,7 +795,7 @@ avma1pp2_hscx_intr(int h_chan, u_int stat, struct l1_softc *sc) if(sc->sc_trace & TRACE_B_RX) { i4b_trace_hdr_t hdr; - hdr.unit = L0IFPIUNIT(sc->sc_unit); + hdr.unit = L0IFPI2UNIT(sc->sc_unit); hdr.type = (h_chan == HSCX_CH_A ? TRC_CH_B1 : TRC_CH_B2); hdr.dir = FROM_NT; hdr.count = ++sc->sc_trace_bcount; @@ -899,7 +899,7 @@ avma1pp2_hscx_intr(int h_chan, u_int stat, struct l1_softc *sc) if(sc->sc_trace & TRACE_B_TX) { i4b_trace_hdr_t hdr; - hdr.unit = L0IFPIUNIT(sc->sc_unit); + hdr.unit = L0IFPI2UNIT(sc->sc_unit); hdr.type = (h_chan == HSCX_CH_A ? TRC_CH_B1 : TRC_CH_B2); hdr.dir = FROM_TE; hdr.count = ++sc->sc_trace_bcount; @@ -1164,7 +1164,7 @@ avma1pp2_bchannel_start(int unit, int h_chan) if(sc->sc_trace & TRACE_B_TX) /* if trace, send mbuf to trace dev */ { i4b_trace_hdr_t hdr; - hdr.unit = L0IFPIUNIT(sc->sc_unit); + hdr.unit = L0IFPI2UNIT(sc->sc_unit); hdr.type = (h_chan == HSCX_CH_A ? TRC_CH_B1 : TRC_CH_B2); hdr.dir = FROM_TE; hdr.count = ++sc->sc_trace_bcount; @@ -1348,7 +1348,7 @@ avma1pp2_hscx_fifo(l1_bchan_state_t *chan, struct l1_softc *sc) if(sc->sc_trace & TRACE_B_TX) { i4b_trace_hdr_t hdr; - hdr.unit = L0IFPIUNIT(sc->sc_unit); + hdr.unit = L0IFPI2UNIT(sc->sc_unit); hdr.type = (chan->channel == HSCX_CH_A ? TRC_CH_B1 : TRC_CH_B2); hdr.dir = FROM_TE; hdr.count = ++sc->sc_trace_bcount; |
