diff options
| author | phk <phk@FreeBSD.org> | 1998-12-11 21:40:13 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 1998-12-11 21:40:13 +0000 |
| commit | 990b5dccf9710fb69f762c919806ac1d4c08227a (patch) | |
| tree | e60b5df77867faddc84349505f1735a476039b37 /sys/net | |
| parent | 0257da59197a6c09cea232fa6b7c903598e79cd5 (diff) | |
| download | FreeBSD-src-990b5dccf9710fb69f762c919806ac1d4c08227a.zip FreeBSD-src-990b5dccf9710fb69f762c919806ac1d4c08227a.tar.gz | |
*** empty log message ***
Diffstat (limited to 'sys/net')
| -rw-r--r-- | sys/net/if_sppp.h | 8 | ||||
| -rw-r--r-- | sys/net/if_spppsubr.c | 19 |
2 files changed, 16 insertions, 11 deletions
diff --git a/sys/net/if_sppp.h b/sys/net/if_sppp.h index 41e5d8e..855e199 100644 --- a/sys/net/if_sppp.h +++ b/sys/net/if_sppp.h @@ -16,11 +16,11 @@ * * From: Version 2.0, Fri Oct 6 20:39:21 MSK 1995 * - * $Id: if_sppp.h,v 1.8 1997/10/11 11:25:20 joerg Exp $ + * $Id: if_sppp.h,v 1.9 1998/08/15 21:58:09 bde Exp $ */ -#ifndef _NET_IF_HDLC_H_ -#define _NET_IF_HDLC_H_ 1 +#ifndef _NET_IF_SPPP_H +#define _NET_IF_SPPP_H 1 #define IDX_LCP 0 /* idx into state table */ @@ -159,4 +159,4 @@ int sppp_isempty (struct ifnet *ifp); void sppp_flush (struct ifnet *ifp); #endif -#endif /* _NET_IF_HDLC_H_ */ +#endif /* _NET_IF_SPPP_H */ diff --git a/sys/net/if_spppsubr.c b/sys/net/if_spppsubr.c index aeb9550..8a64aa4 100644 --- a/sys/net/if_spppsubr.c +++ b/sys/net/if_spppsubr.c @@ -17,7 +17,7 @@ * * From: Version 2.4, Thu Apr 30 17:17:21 MSD 1997 * - * $Id: if_spppsubr.c,v 1.45 1998/10/06 21:12:45 joerg Exp $ + * $Id: if_spppsubr.c,v 1.46 1998/12/04 22:54:52 archie Exp $ */ #include <sys/param.h> @@ -651,12 +651,17 @@ sppp_output(struct ifnet *ifp, struct mbuf *m, struct ip *ip = mtod (m, struct ip*); struct tcphdr *tcp = (struct tcphdr*) ((long*)ip + ip->ip_hl); - if (! IF_QFULL (&sp->pp_fastq) && - ((ip->ip_tos & IPTOS_LOWDELAY) || - ((ip->ip_p == IPPROTO_TCP && - m->m_len >= sizeof (struct ip) + sizeof (struct tcphdr) && - (INTERACTIVE (ntohs (tcp->th_sport)))) || - INTERACTIVE (ntohs (tcp->th_dport))))) + if (IF_QFULL (&sp->pp_fastq)) + ; + else if (ip->ip_tos & IPTOS_LOWDELAY) + ifq = &sp->pp_fastq; + else if (m->m_len < sizeof *ip + sizeof *tcp) + ; + else if (ip->ip_p != IPPROTO_TCP) + ; + else if (INTERACTIVE (ntohs (tcp->th_sport))) + ifq = &sp->pp_fastq; + else if (INTERACTIVE (ntohs (tcp->th_dport))) ifq = &sp->pp_fastq; } #endif |
