Cosmetic: Make struct mbuf more like kernel mbufs.

1 files changed, 10 insertions, 10 deletions

diff --git a/usr.sbin/ppp/cbcp.c b/usr.sbin/ppp/cbcp.c
index 7de9748..d04e127 100644
--- a/usr.sbin/ppp/cbcp.c
+++ b/usr.sbin/ppp/cbcp.c
@@ -195,7 +195,7 @@ cbcp_Output(struct cbcp *cbcp, u_char code, struct cbcp_data *data)
   struct cbcp_header *head;
   struct mbuf *bp;
 
-  bp = mbuf_Alloc(sizeof *head + data->length, MB_CBCPOUT);
+  bp = m_get(sizeof *head + data->length, MB_CBCPOUT);
   head = (struct cbcp_header *)MBUF_CTOP(bp);
   head->code = code;
   head->id = cbcp->fsm.id;
@@ -622,29 +622,29 @@ cbcp_Input(struct bundle *bundle, struct link *l, struct mbuf *bp)
 
   if (p == NULL) {
     log_Printf(LogERROR, "cbcp_Input: Not a physical link - dropped\n");
-    mbuf_Free(bp);
+    m_freem(bp);
     return NULL;
   }
 
-  bp = mbuf_Contiguous(bp);
-  len = mbuf_Length(bp);
+  bp = m_pullup(bp);
+  len = m_length(bp);
   if (len < sizeof(struct cbcp_header)) {
-    mbuf_Free(bp);
+    m_freem(bp);
     return NULL;
   }
   head = (struct cbcp_header *)MBUF_CTOP(bp);
   if (ntohs(head->length) != len) {
     log_Printf(LogWARN, "Corrupt CBCP packet (code %d, length %d not %d)"
                " - ignored\n", head->code, ntohs(head->length), len);
-    mbuf_Free(bp);
+    m_freem(bp);
     return NULL;
   }
-  mbuf_SetType(bp, MB_CBCPIN);
+  m_settype(bp, MB_CBCPIN);
 
   /* XXX check the id */
 
-  bp->offset += sizeof(struct cbcp_header);
-  bp->cnt -= sizeof(struct cbcp_header);
+  bp->m_offset += sizeof(struct cbcp_header);
+  bp->m_len -= sizeof(struct cbcp_header);
   data = (struct cbcp_data *)MBUF_CTOP(bp);
 
   switch (head->code) {
@@ -731,7 +731,7 @@ cbcp_Input(struct bundle *bundle, struct link *l, struct mbuf *bp)
       break;
   }
 
-  mbuf_Free(bp);
+  m_freem(bp);
   return NULL;
 }