X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=modules%2Fppp_ahdlc.c;h=93c5226189de10cd8aa140a5f72d570966a2eef8;hb=2822dcefddddad21d9307250fbefde3eeffbaa86;hp=c1853bbb9e437cd4be3e7f99109864a9582307c8;hpb=4fdc878315fc1752f4cf53b3352f27f09e2b6bcb;p=ppp.git

diff --git a/modules/ppp_ahdlc.c b/modules/ppp_ahdlc.c
index c1853bb..93c5226 100644
--- a/modules/ppp_ahdlc.c
+++ b/modules/ppp_ahdlc.c
@@ -24,7 +24,7 @@
  * OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS,
  * OR MODIFICATIONS.
  *
- * $Id: ppp_ahdlc.c,v 1.7 1998/03/24 23:52:35 paulus Exp $
+ * $Id: ppp_ahdlc.c,v 1.9 1999/02/26 10:52:07 paulus Exp $
  */
 
 /*
@@ -94,8 +94,6 @@ struct streamtab ppp_ahdlcinfo = {
     &rinit, &winit, NULL, NULL
 };
 
-int ppp_ahdlc_count;
-
 typedef struct ahdlc_state {
     int flags;
     mblk_t *cur_frame;
@@ -172,7 +170,6 @@ MOD_OPEN(ahdlc_open)
 	sp->xaccm[0] = ~0;
 	sp->xaccm[3] = 0x60000000;
 	sp->mru = PPP_MRU;
-	++ppp_ahdlc_count;
 	qprocson(q);
     }
     return 0;
@@ -190,7 +187,8 @@ MOD_CLOSE(ahdlc_close)
 	    state->cur_frame = 0;
 	}
 	FREE(q->q_ptr, sizeof(ahdlc_state_t));
-	--ppp_ahdlc_count;
+	q->q_ptr = NULL;
+	OTHERQ(q)->q_ptr = NULL;
     }
     return 0;
 }
@@ -207,6 +205,12 @@ ahdlc_wput(q, mp)
     struct ppp_stats *psp;
 
     state = (ahdlc_state_t *) q->q_ptr;
+    if (state == 0) {
+	DPRINT("state == 0 in ahdlc_wput\n");
+	freemsg(mp);
+	return 0;
+    }
+
     switch (mp->b_datap->db_type) {
     case M_DATA:
 	/*
@@ -326,6 +330,7 @@ ahdlc_wput(q, mp)
     default:
 	putnext(q, mp);
     }
+
     return 0;
 }
 
@@ -338,6 +343,13 @@ ahdlc_rput(q, mp)
     uchar_t *cp;
     ahdlc_state_t *state;
 
+    state = (ahdlc_state_t *) q->q_ptr;
+    if (state == 0) {
+	DPRINT("state == 0 in ahdlc_rput\n");
+	freemsg(mp);
+	return 0;
+    }
+
     switch (mp->b_datap->db_type) {
     case M_DATA:
 	unstuff_chars(q, mp);
@@ -345,7 +357,6 @@ ahdlc_rput(q, mp)
 	break;
 
     case M_HANGUP:
-	state = (ahdlc_state_t *) q->q_ptr;
 	if (state->cur_frame != 0) {
 	    /* XXX would like to send this up for debugging */
 	    freemsg(state->cur_frame);
@@ -395,12 +406,14 @@ stuff_frame(q, mp)
 	goto bomb;
 
     /*
-     * Put in an initial flag for now.  We'll remove it later
-     * if we decide we don't need it.
+     * Put in an initial flag, unless the serial driver currently has
+     * packets still to be transmitted in its queue.
      */
     dp = op->b_wptr;
-    *dp++ = PPP_FLAG;
-    --olen;
+    if (qsize(q->q_next) == 0) {
+	*dp++ = PPP_FLAG;
+	--olen;
+    }
 
     /*
      * For LCP packets with code values between 1 and 7 (Conf-Req
@@ -512,12 +525,6 @@ stuff_frame(q, mp)
     *dp++ = PPP_FLAG;
     op->b_wptr = dp;
 
-    /*
-     * Remove the initial flag, if possible.
-     */
-    if (qsize(q->q_next) > 0)
-	++omsg->b_rptr;
-
     /*
      * Update statistics.
      */