RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

Use net/slcompress.h instead of net/pppcompress.h.

Browse Source
This commit is contained in:
Ralf Corsepius
2007-03-28 02:19:04 +00:00
parent 179c2c3357
commit 47a8868989
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
cpukit/libnetworking/net/if_ppp.c
View File

@@ -117,7 +117,7 @@
#endif
#ifdef VJC
#include <net/pppcompress.h>
#include <net/slcompress.h>
#endif
#include <net/ppp_defs.h>
@@ -516,7 +516,7 @@ pppalloc(pid)
MALLOC(sc->sc_comp, struct vjcompress *, sizeof(struct vjcompress),
M_DEVBUF, M_NOWAIT);
if (sc->sc_comp)
vj_compress_init(sc->sc_comp, -1);
sl_compress_init(sc->sc_comp, -1);
#endif
#ifdef PPP_COMPRESS
sc->sc_xc_state = NULL;
@@ -693,7 +693,7 @@ pppioctl(sc, cmd, data, flag, p)
case PPPIOCSMAXCID:
if (sc->sc_comp) {
s = splsoftnet();
vj_compress_init(sc->sc_comp, *(int *)data);
sl_compress_init(sc->sc_comp, *(int *)data);
splx(s);
}
break;
@@ -1225,7 +1225,7 @@ ppp_dequeue(sc)
}
/* this code assumes the IP/TCP header is in one non-shared mbuf */
if (ip->ip_p == IPPROTO_TCP) {
type = vj_compress_tcp(mp, ip, sc->sc_comp,
type = sl_compress_tcp(mp, ip, sc->sc_comp,
!(sc->sc_flags & SC_NO_TCP_CCID));
switch (type) {
case TYPE_UNCOMPRESSED_TCP:
@@ -1532,7 +1532,7 @@ ppp_inproc(sc, m)
* packets which don't have an explicit connection ID.
*/
if (sc->sc_comp)
vj_uncompress_tcp(NULL, 0, TYPE_ERROR, sc->sc_comp);
sl_uncompress_tcp(NULL, 0, TYPE_ERROR, sc->sc_comp);
s = splimp();
sc->sc_flags &= ~SC_VJ_RESET;
splx(s);
@@ -1545,7 +1545,7 @@ ppp_inproc(sc, m)
if ((sc->sc_flags & SC_REJ_COMP_TCP) || sc->sc_comp == 0)
goto bad;
xlen = vj_uncompress_tcp_core(cp + PPP_HDRLEN, m->m_len - PPP_HDRLEN,
xlen = sl_uncompress_tcp_core(cp + PPP_HDRLEN, m->m_len - PPP_HDRLEN,
ilen - PPP_HDRLEN, TYPE_COMPRESSED_TCP,
sc->sc_comp, &iphdr, &hlen);
@@ -1600,7 +1600,7 @@ ppp_inproc(sc, m)
if ((sc->sc_flags & SC_REJ_COMP_TCP) || sc->sc_comp == 0)
goto bad;
xlen = vj_uncompress_tcp_core(cp + PPP_HDRLEN, m->m_len - PPP_HDRLEN,
xlen = sl_uncompress_tcp_core(cp + PPP_HDRLEN, m->m_len - PPP_HDRLEN,
ilen - PPP_HDRLEN, TYPE_UNCOMPRESSED_TCP,
sc->sc_comp, &iphdr, &hlen);

2
cpukit/libnetworking/net/ppp_tty.c
View File

@@ -96,7 +96,7 @@
#include <netinet/in.h>
#include <netinet/in_systm.h>
#include <netinet/ip.h>
#include <net/pppcompress.h>
#include <net/slcompress.h>
#endif
#include <rtems.h>