diff options
Diffstat (limited to 'usr.sbin/ppp/mp.c')
-rw-r--r-- | usr.sbin/ppp/mp.c | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/usr.sbin/ppp/mp.c b/usr.sbin/ppp/mp.c index af5a47c..993d6bf 100644 --- a/usr.sbin/ppp/mp.c +++ b/usr.sbin/ppp/mp.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: mp.c,v 1.18 1999/01/28 01:56:33 brian Exp $ + * $Id: mp.c,v 1.19 1999/05/08 11:07:17 brian Exp $ */ #include <sys/param.h> @@ -490,20 +490,9 @@ mp_Assemble(struct mp *mp, struct mbuf *m, struct physical *p) } while (!h.end); if (q) { - u_short proto; - u_char ch; - - q = mbuf_Read(q, &ch, 1); - proto = ch; - if (!(proto & 1)) { - q = mbuf_Read(q, &ch, 1); - proto <<= 8; - proto += ch; - } - if (log_IsKept(LogDEBUG)) - log_Printf(LogDEBUG, "MP: Reassembled frags %ld-%lu, length %d\n", - first, (u_long)h.seq, mbuf_Length(q)); q = mbuf_Contiguous(q); + log_Printf(LogDEBUG, "MP: Reassembled frags %ld-%lu, length %d\n", + first, (u_long)h.seq, mbuf_Length(q)); link_PullPacket(&mp->link, MBUF_CTOP(q), q->cnt, mp->bundle); } |