[src/netbsd-1-6]: src/sys/net Pull up revision 1.67 via patch (requested by m...

[tron <tron%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/788d814290fd
branches:  netbsd-1-6
changeset: 530504:788d814290fd
user:      tron <tron%NetBSD.org@localhost>
date:      Thu Jul 10 15:40:45 2003 +0000

description:
Pull up revision 1.67 via patch (requested by martin in ticket #1374):
We should use IFQ_DEQUEUE to get packets from the send queue, not IF_DEQUEUE.
Hopefully this will fix ALTQ for ISDN and PPPoE interfaces.
While there remove an unsued function which contained dubious code
(accessing interface queue internals w/o the proper macros).

diffstat:

 sys/net/if_spppsubr.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 8167733b0258 -r 788d814290fd sys/net/if_spppsubr.c
--- a/sys/net/if_spppsubr.c     Thu Jul 10 15:30:18 2003 +0000
+++ b/sys/net/if_spppsubr.c     Thu Jul 10 15:40:45 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_spppsubr.c,v 1.46.4.18 2003/06/24 08:18:29 grant Exp $       */
+/*     $NetBSD: if_spppsubr.c,v 1.46.4.19 2003/07/10 15:40:45 tron Exp $        */
 
 /*
  * Synchronous PPP/Cisco link level subroutines.
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_spppsubr.c,v 1.46.4.18 2003/06/24 08:18:29 grant Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_spppsubr.c,v 1.46.4.19 2003/07/10 15:40:45 tron Exp $");
 
 #include "opt_inet.h"
 #include "opt_ipx.h"
@@ -1053,7 +1053,7 @@
            (sppp_ncp_check(sp) || (sp->pp_flags & PP_CISCO) != 0)) {
                IF_DEQUEUE(&sp->pp_fastq, m);
                if (m == NULL)
-                       IF_DEQUEUE(&sp->pp_if.if_snd, m);
+                       IFQ_DEQUEUE(&sp->pp_if.if_snd, m);
        }
        splx(s);
        return m;