diff options
| author | mjacob <mjacob@FreeBSD.org> | 2002-02-07 22:08:32 +0000 |
|---|---|---|
| committer | mjacob <mjacob@FreeBSD.org> | 2002-02-07 22:08:32 +0000 |
| commit | f5604f20858338a28a87f06fdcc3773511f51522 (patch) | |
| tree | 01004c2d76e07c971788254c912abbc9ed44cb77 | |
| parent | c83077ee4a35c6e7020b59c35c463d6d0c3f64e9 (diff) | |
| download | FreeBSD-src-f5604f20858338a28a87f06fdcc3773511f51522.zip FreeBSD-src-f5604f20858338a28a87f06fdcc3773511f51522.tar.gz | |
Replace a few more lines of code orphaned by MFREE going away.
MFC after: 1 day
| -rw-r--r-- | sys/netatm/port.h | 12 | ||||
| -rw-r--r-- | sys/security/lomac/kernel_socket.c | 4 |
2 files changed, 10 insertions, 6 deletions
diff --git a/sys/netatm/port.h b/sys/netatm/port.h index 911f9a2..a9daf4b 100644 --- a/sys/netatm/port.h +++ b/sys/netatm/port.h @@ -274,10 +274,12 @@ typedef struct mbuf KBuffer; (prev)->m_next = (new); \ } #define KB_UNLINKHEAD(head, next) { \ - MFREE((head), (next)); \ + (next) = m_free((head)); \ + (head) = NULL; \ } #define KB_UNLINK(old, prev, next) { \ - MFREE((old), (next)); \ + (next) = m_free((old)); \ + (old) = NULL; \ (prev)->m_next = (next); \ } #define KB_ISPKT(bfr) (((bfr)->m_flags & M_PKTHDR) != 0) @@ -407,10 +409,12 @@ typedef struct mbuf KBuffer; (prev)->m_next = (new); \ } #define KB_UNLINKHEAD(head, next) { \ - MFREE((head), (next)); \ + (next) = m_free((head)); \ + (head) = NULL; \ } #define KB_UNLINK(old, prev, next) { \ - MFREE((old), (next)); \ + (next) = m_free((old)); \ + (old) = NULL; \ (prev)->m_next = (next); \ } #define KB_ISPKT(bfr) (0) diff --git a/sys/security/lomac/kernel_socket.c b/sys/security/lomac/kernel_socket.c index ef0553c..541822b 100644 --- a/sys/security/lomac/kernel_socket.c +++ b/sys/security/lomac/kernel_socket.c @@ -644,7 +644,7 @@ dontblock: m = m->m_next; } else { 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; } } @@ -729,7 +729,7 @@ dontblock: so->so_rcv.sb_mb = m = m->m_next; *mp = (struct mbuf *)0; } else { - MFREE(m, so->so_rcv.sb_mb); + so->so_rcv.sb_mb = m_free(m); m = so->so_rcv.sb_mb; } if (m) |
