Ensure that the thing we're casting to struct ip

is aligned for non-i386 architectures.

1 files changed, 3 insertions, 7 deletions

diff --git a/usr.sbin/ppp/hdlc.c b/usr.sbin/ppp/hdlc.c
index ff509b8..894b2b3 100644
--- a/usr.sbin/ppp/hdlc.c
+++ b/usr.sbin/ppp/hdlc.c
@@ -17,7 +17,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: hdlc.c,v 1.38 1999/02/06 02:54:45 brian Exp $
+ * $Id: hdlc.c,v 1.39 1999/02/11 10:14:08 brian Exp $
  *
  *	TODO:
  */
@@ -174,7 +174,7 @@ hdlc_Output(struct link *l, int pri, u_short proto, struct mbuf *bp)
     mhp->cnt += 2;
   }
 
-  mhp->next = bp;
+  mhp->next = bp = mbuf_Contiguous(bp);
 
   if (!p) {
     /*
@@ -188,11 +188,7 @@ hdlc_Output(struct link *l, int pri, u_short proto, struct mbuf *bp)
     return;
   }
 
-  /* Tack mfcs onto the end, then set bp back to the start of the data */
-  while (bp->next != NULL)
-    bp = bp->next;
-  bp->next = mfcs;
-  bp = mhp->next;
+  bp->next = mfcs;		/* Tack mfcs onto the end */
 
   p->hdlc.lqm.OutOctets += mbuf_Length(mhp) + 1;
   p->hdlc.lqm.OutPackets++;