put vax headers in their place

[unix-history] / usr / src / sys / kern / uipc_mbuf.c

diff --git a/usr/src/sys/kern/uipc_mbuf.c b/usr/src/sys/kern/uipc_mbuf.c
index 9bfa33a..323539d 100644 (file)
--- a/usr/src/sys/kern/uipc_mbuf.c
+++ b/usr/src/sys/kern/uipc_mbuf.c
@@ -1,4 +1,4 @@
-/*     uipc_mbuf.c     1.36    82/06/20        */
+/*     uipc_mbuf.c     1.38    82/10/09        */

 
 #include "../h/param.h"
 #include "../h/dir.h"
 
 #include "../h/param.h"
 #include "../h/dir.h"


@@ -8,7 +8,6 @@
 #include "../h/cmap.h"
 #include "../h/map.h"
 #include "../h/mbuf.h"
 #include "../h/cmap.h"
 #include "../h/map.h"
 #include "../h/mbuf.h"

-#include "../net/in_systm.h"           /* XXX */

 #include "../h/vm.h"
 
 mbinit()
 #include "../h/vm.h"
 
 mbinit()


@@ -118,7 +117,6 @@ m_getclr(canwait)
        m = m_get(canwait);
        if (m == 0)
                return (0);
        m = m_get(canwait);
        if (m == 0)
                return (0);

-       m->m_off = MMINOFF;

        bzero(mtod(m, caddr_t), MLEN);
        return (m);
 }
        bzero(mtod(m, caddr_t), MLEN);
        return (m);
 }


@@ -206,11 +204,9 @@ m_copy(m, off, len)
                        p = mtod(m, struct mbuf *);
                        n->m_off = ((int)p - (int)n) + off;
                        mclrefcnt[mtocl(p)]++;
                        p = mtod(m, struct mbuf *);
                        n->m_off = ((int)p - (int)n) + off;
                        mclrefcnt[mtocl(p)]++;

-               } else {
-                       n->m_off = MMINOFF;
+               } else

                        bcopy(mtod(m, caddr_t)+off, mtod(n, caddr_t),
                            (unsigned)n->m_len);
                        bcopy(mtod(m, caddr_t)+off, mtod(n, caddr_t),
                            (unsigned)n->m_len);

-               }

                if (len != M_COPYALL)
                        len -= n->m_len;
                off = 0;
                if (len != M_COPYALL)
                        len -= n->m_len;
                off = 0;


@@ -294,10 +290,9 @@ m_pullup(m0, len)
        n = m0;
        if (len > MLEN)
                goto bad;
        n = m0;
        if (len > MLEN)
                goto bad;

-       MGET(m, 0);
+       MGET(m, M_DONTWAIT);

        if (m == 0)
                goto bad;
        if (m == 0)
                goto bad;

-       m->m_off = MMINOFF;

        m->m_len = 0;
        do {
                count = MIN(MLEN - m->m_len, len);
        m->m_len = 0;
        do {
                count = MIN(MLEN - m->m_len, len);