diff options
| author | Max Laier <mlaier@FreeBSD.org> | 2005-01-21 00:50:51 +0000 |
|---|---|---|
| committer | Max Laier <mlaier@FreeBSD.org> | 2005-01-21 00:50:51 +0000 |
| commit | e19fb30fbd3110b77ccbdee39b208fdc7e556183 (patch) | |
| tree | 5447f2cc1524b454a1188f6af8fb6d9932cc1b8b | |
| parent | bf065d9f0bf6115d9b4796810f0f6e3d9b798b5b (diff) | |
Notes
| -rw-r--r-- | share/man/man4/altq.4 | 5 | ||||
| -rw-r--r-- | sys/pci/if_sk.c | 12 |
2 files changed, 10 insertions, 7 deletions
diff --git a/share/man/man4/altq.4 b/share/man/man4/altq.4 index ddf41fbf30096..8ef7a87168488 100644 --- a/share/man/man4/altq.4 +++ b/share/man/man4/altq.4 @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd November 21, 2004 +.Dd December 24, 2004 .Dt ALTQ 4 .Os .Sh NAME @@ -120,7 +120,8 @@ They have been applied to the following hardware drivers: .Xr rl 4 , .Xr sf 4 , .Xr sis 4 , -.Xr vr 4 +.Xr sk 4 , +.Xr vr 4 , .Xr wi 4 , and .Xr xl 4 . diff --git a/sys/pci/if_sk.c b/sys/pci/if_sk.c index f6bb99a852570..ee329a950c6f5 100644 --- a/sys/pci/if_sk.c +++ b/sys/pci/if_sk.c @@ -1385,7 +1385,9 @@ sk_attach(dev) ifp->if_watchdog = sk_watchdog; ifp->if_init = sk_init; ifp->if_baudrate = 1000000000; - ifp->if_snd.ifq_maxlen = SK_TX_RING_CNT - 1; + IFQ_SET_MAXLEN(&ifp->if_snd, SK_TX_RING_CNT - 1); + ifp->if_snd.ifq_drv_maxlen = SK_TX_RING_CNT - 1; + IFQ_SET_READY(&ifp->if_snd); callout_handle_init(&sc_if->sk_tick_ch); @@ -1804,7 +1806,7 @@ sk_start(ifp) idx = sc_if->sk_cdata.sk_tx_prod; while(sc_if->sk_cdata.sk_tx_chain[idx].sk_mbuf == NULL) { - IF_DEQUEUE(&ifp->if_snd, m_head); + IFQ_DRV_DEQUEUE(&ifp->if_snd, m_head); if (m_head == NULL) break; @@ -1814,7 +1816,7 @@ sk_start(ifp) * for the NIC to drain the ring. */ if (sk_encap(sc_if, m_head, &idx)) { - IF_PREPEND(&ifp->if_snd, m_head); + IFQ_DRV_PREPEND(&ifp->if_snd, m_head); ifp->if_flags |= IFF_OACTIVE; break; } @@ -2217,9 +2219,9 @@ sk_intr(xsc) CSR_WRITE_4(sc, SK_IMR, sc->sk_intrmask); - if (ifp0 != NULL && ifp0->if_snd.ifq_head != NULL) + if (ifp0 != NULL && !IFQ_DRV_IS_EMPTY(&ifp0->if_snd)) sk_start(ifp0); - if (ifp1 != NULL && ifp1->if_snd.ifq_head != NULL) + if (ifp1 != NULL && !IFQ_DRV_IS_EMPTY(&ifp1->if_snd)) sk_start(ifp1); SK_UNLOCK(sc); |