d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace a few more lines of code orphaned by MFREE going away.

Browse Source 
MFC after:	1 day
This commit is contained in:
Matt Jacob 2002-02-07 22:08:32 +00:00
parent 943e9b67f5
commit 280304eb49
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/netatm/port.h
View File

@ -274,10 +274,12 @@ typedef struct mbuf KBuffer;
(prev)->m_next = (new); \ (prev)->m_next = (new); \
} }
#define KB_UNLINKHEAD(head, next) { \ #define KB_UNLINKHEAD(head, next) { \
MFREE((head), (next)); \ (next) = m_free((head)); \
(head) = NULL; \
} }
#define KB_UNLINK(old, prev, next) { \ #define KB_UNLINK(old, prev, next) { \
MFREE((old), (next)); \ (next) = m_free((old)); \
(old) = NULL; \
(prev)->m_next = (next); \ (prev)->m_next = (next); \
} }
#define KB_ISPKT(bfr) (((bfr)->m_flags & M_PKTHDR) != 0) #define KB_ISPKT(bfr) (((bfr)->m_flags & M_PKTHDR) != 0)
@ -407,10 +409,12 @@ typedef struct mbuf KBuffer;
(prev)->m_next = (new); \ (prev)->m_next = (new); \
} }
#define KB_UNLINKHEAD(head, next) { \ #define KB_UNLINKHEAD(head, next) { \
MFREE((head), (next)); \ (next) = m_free((head)); \
(head) = NULL; \
} }
#define KB_UNLINK(old, prev, next) { \ #define KB_UNLINK(old, prev, next) { \
MFREE((old), (next)); \ (next) = m_free((old)); \
(old) = NULL; \
(prev)->m_next = (next); \ (prev)->m_next = (next); \
} }
#define KB_ISPKT(bfr) (0) #define KB_ISPKT(bfr) (0)

4
sys/security/lomac/kernel_socket.c
View File

@ -644,7 +644,7 @@ monitored_soreceive(so, psa, uio, mp0, controlp, flagsp)
m = m->m_next; m = m->m_next;
} else { } else {
sbfree(&so->so_rcv, m); sbfree(&so->so_rcv, m);
MFREE(m, so->so_rcv.sb_mb); so->so_rcv.sb_mb = m_free(m);
m = so->so_rcv.sb_mb; m = so->so_rcv.sb_mb;
} }
} }
@ -729,7 +729,7 @@ monitored_soreceive(so, psa, uio, mp0, controlp, flagsp)
so->so_rcv.sb_mb = m = m->m_next; so->so_rcv.sb_mb = m = m->m_next;
*mp = (struct mbuf *)0; *mp = (struct mbuf *)0;
} else { } else {
MFREE(m, so->so_rcv.sb_mb); so->so_rcv.sb_mb = m_free(m);
m = so->so_rcv.sb_mb; m = so->so_rcv.sb_mb;
} }
if (m) if (m)