Module Name: src
Committed By: knakahara
Date: Thu Sep 15 06:59:32 UTC 2016
Modified Files:
src/sys/net: if_gif.c
Log Message:
kmem_alloc(size, KM_SLEEP) return value NULL check is not required any more.
kmem_alloc(size, KM_SLEEP) is already fixed, that is, it never return NULL.
see: sys/kern/subr_kmem.c:r1.62
To generate a diff of this commit:
cvs rdiff -u -r1.122 -r1.123 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.122 src/sys/net/if_gif.c:1.123
--- src/sys/net/if_gif.c:1.122 Thu Sep 1 06:50:09 2016
+++ src/sys/net/if_gif.c Thu Sep 15 06:59:32 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_gif.c,v 1.122 2016/09/01 06:50:09 knakahara Exp $ */
+/* $NetBSD: if_gif.c,v 1.123 2016/09/15 06:59:32 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.122 2016/09/01 06:50:09 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_gif.c,v 1.123 2016/09/15 06:59:32 knakahara Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -991,15 +991,8 @@ gif_set_tunnel(struct ifnet *ifp, struct
/* XXX both end must be valid? (I mean, not 0.0.0.0) */
}
- if ((nsrc = sockaddr_dup(src, M_WAITOK)) == NULL) {
- error = ENOMEM;
- goto out;
- }
- if ((ndst = sockaddr_dup(dst, M_WAITOK)) == NULL) {
- sockaddr_free(nsrc);
- error = ENOMEM;
- goto out;
- }
+ nsrc = sockaddr_dup(src, M_WAITOK);
+ ndst = sockaddr_dup(dst, M_WAITOK);
gif_encap_pause(sc);
