diff options
| author | mlaier <mlaier@FreeBSD.org> | 2004-06-13 17:29:10 +0000 |
|---|---|---|
| committer | mlaier <mlaier@FreeBSD.org> | 2004-06-13 17:29:10 +0000 |
| commit | 977d97b004a1ae5bbd9d42eae28386f8e2372068 (patch) | |
| tree | 75b8601b85775d6a872ff81b3098fedeb53233af /sys/net/if_ppp.c | |
| parent | 469e445f95c246a203c12198eff9932b25b49b12 (diff) | |
| download | FreeBSD-src-977d97b004a1ae5bbd9d42eae28386f8e2372068.zip FreeBSD-src-977d97b004a1ae5bbd9d42eae28386f8e2372068.tar.gz | |
Link ALTQ to the build and break with ABI for struct ifnet. Please recompile
your (network) modules as well as any userland that might make sense of
sizeof(struct ifnet).
This does not change the queueing yet. These changes will follow in a
seperate commit. Same with the driver changes, which need case by case
evaluation.
__FreeBSD_version bump will follow.
Tested-by: (i386)LINT
Diffstat (limited to 'sys/net/if_ppp.c')
| -rw-r--r-- | sys/net/if_ppp.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sys/net/if_ppp.c b/sys/net/if_ppp.c index d7e007e..d0db17e 100644 --- a/sys/net/if_ppp.c +++ b/sys/net/if_ppp.c @@ -933,7 +933,8 @@ pppoutput(ifp, m0, dst, rtp) sc->sc_npqtail = &m0->m_nextpkt; } else { /* fastq and if_snd are emptied at spl[soft]net now */ - ifq = (m0->m_flags & M_HIGHPRI)? &sc->sc_fastq: &ifp->if_snd; + ifq = (m0->m_flags & M_HIGHPRI)? &sc->sc_fastq: + (struct ifqueue *)&ifp->if_snd; IF_LOCK(ifq); if (_IF_QFULL(ifq) && dst->sa_family != AF_UNSPEC) { _IF_DROP(ifq); @@ -988,7 +989,8 @@ ppp_requeue(sc) */ *mpp = m->m_nextpkt; m->m_nextpkt = NULL; - ifq = (m->m_flags & M_HIGHPRI)? &sc->sc_fastq: &sc->sc_if.if_snd; + ifq = (m->m_flags & M_HIGHPRI)? &sc->sc_fastq: + (struct ifqueue *)&sc->sc_if.if_snd; if (! IF_HANDOFF(ifq, m, NULL)) { sc->sc_if.if_oerrors++; sc->sc_stats.ppp_oerrors++; |
