Module Name: src
Committed By: mbalmer
Date: Sun Nov 25 09:06:43 UTC 2012
Modified Files:
src/sys/net: if_ppp.c
Log Message:
Don't check mp for NULL twice. From Michael W. Bomardieri <[email protected]>
via [email protected]. Thanks!
To generate a diff of this commit:
cvs rdiff -u -r1.137 -r1.138 src/sys/net/if_ppp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/if_ppp.c
diff -u src/sys/net/if_ppp.c:1.137 src/sys/net/if_ppp.c:1.138
--- src/sys/net/if_ppp.c:1.137 Thu Oct 11 20:05:50 2012
+++ src/sys/net/if_ppp.c Sun Nov 25 09:06:43 2012
@@ -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 */
/*
@@ -102,7 +102,7 @@
*/
#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"
@@ -1266,7 +1266,7 @@ ppp_ccp(struct ppp_softc *sc, struct mbu
mp = m->m_next;
if (mp == NULL)
return;
- dp = (mp != NULL)? mtod(mp, u_char *): NULL;
+ dp = mtod(mp, u_char *);
} else {
mp = m;
dp = mtod(mp, u_char *) + PPP_HDRLEN;
