Module Name: src
Committed By: knakahara
Date: Thu Dec 21 09:35:38 UTC 2017
Modified Files:
src/sys/net: if_gif.c
Log Message:
remove duplicated null ckeck
To generate a diff of this commit:
cvs rdiff -u -r1.136 -r1.137 src/sys/net/if_gif.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_gif.c
diff -u src/sys/net/if_gif.c:1.136 src/sys/net/if_gif.c:1.137
--- src/sys/net/if_gif.c:1.136 Sat Dec 9 08:03:06 2017
+++ src/sys/net/if_gif.c Thu Dec 21 09:35:38 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: if_gif.c,v 1.136 2017/12/09 08:03:06 pgoyette Exp $ */
+/* $NetBSD: if_gif.c,v 1.137 2017/12/21 09:35:38 knakahara Exp $ */
/* $KAME: if_gif.c,v 1.76 2001/08/20 02:01:02 kjc Exp $ */
/*
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_gif.c,v 1.136 2017/12/09 08:03:06 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_gif.c,v 1.137 2017/12/21 09:35:38 knakahara Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -382,11 +382,8 @@ gif_encapcheck(struct mbuf *m, int off,
return 0;
var = gif_getref_variant(sc, &psref);
- if (var->gv_psrc == NULL || var->gv_pdst == NULL)
- goto out;
-
/* no physical address */
- if (!var->gv_psrc || !var->gv_pdst)
+ if (var->gv_psrc == NULL || var->gv_pdst == NULL)
goto out;
switch (proto) {
