Don't check mp for NULL twice. From Michael W. Bomardieri <mb@il.net>

via tech-net@NetBSD.org.  Thanks!
This commit is contained in:
mbalmer 2012-11-25 09:06:43 +00:00
parent 5629a5ffd3
commit 9d9e15ed7b
1 changed files with 3 additions and 3 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: if_ppp.c,v 1.137 2012/10/11 20:05:50 christos Exp $ */ /* $NetBSD: if_ppp.c,v 1.138 2012/11/25 09:06:43 mbalmer Exp $ */
/* Id: if_ppp.c,v 1.6 1997/03/04 03:33:00 paulus Exp */ /* Id: if_ppp.c,v 1.6 1997/03/04 03:33:00 paulus Exp */
/* /*
@ -102,7 +102,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_ppp.c,v 1.137 2012/10/11 20:05:50 christos Exp $"); __KERNEL_RCSID(0, "$NetBSD: if_ppp.c,v 1.138 2012/11/25 09:06:43 mbalmer Exp $");
#include "ppp.h" #include "ppp.h"
@ -1266,7 +1266,7 @@ ppp_ccp(struct ppp_softc *sc, struct mbuf *m, int rcvd)
mp = m->m_next; mp = m->m_next;
if (mp == NULL) if (mp == NULL)
return; return;
dp = (mp != NULL)? mtod(mp, u_char *): NULL; dp = mtod(mp, u_char *);
} else { } else {
mp = m; mp = m;
dp = mtod(mp, u_char *) + PPP_HDRLEN; dp = mtod(mp, u_char *) + PPP_HDRLEN;