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>
This commit is contained in:
parent
f5af6927bf
commit
0893a753c2
@ -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;
|
||||
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user