Module Name: src
Committed By: ozaki-r
Date: Tue Feb 21 03:59:31 UTC 2017
Modified Files:
src/sys/net: if_ethersubr.c
src/sys/netinet6: ip6_input.c
Log Message:
Sweep unnecessary malloc.h inclusions
To generate a diff of this commit:
cvs rdiff -u -r1.238 -r1.239 src/sys/net/if_ethersubr.c
cvs rdiff -u -r1.173 -r1.174 src/sys/netinet6/ip6_input.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_ethersubr.c
diff -u src/sys/net/if_ethersubr.c:1.238 src/sys/net/if_ethersubr.c:1.239
--- src/sys/net/if_ethersubr.c:1.238 Tue Feb 14 03:05:06 2017
+++ src/sys/net/if_ethersubr.c Tue Feb 21 03:59:31 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ethersubr.c,v 1.238 2017/02/14 03:05:06 ozaki-r Exp $ */
+/* $NetBSD: if_ethersubr.c,v 1.239 2017/02/21 03:59:31 ozaki-r Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ethersubr.c,v 1.238 2017/02/14 03:05:06 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ethersubr.c,v 1.239 2017/02/21 03:59:31 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -80,7 +80,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_ethersubr
#include "agr.h"
#include <sys/sysctl.h>
-#include <sys/malloc.h>
#include <sys/mbuf.h>
#include <sys/mutex.h>
#include <sys/ioctl.h>
@@ -1271,8 +1270,7 @@ ether_addmulti(const struct sockaddr *sa
goto out;
}
/*
- * New address or range; malloc a new multicast record
- * and link it into the interface's multicast list.
+ * Link a new multicast record into the interface's multicast list.
*/
memcpy(enm->enm_addrlo, addrlo, 6);
memcpy(enm->enm_addrhi, addrhi, 6);
Index: src/sys/netinet6/ip6_input.c
diff -u src/sys/netinet6/ip6_input.c:1.173 src/sys/netinet6/ip6_input.c:1.174
--- src/sys/netinet6/ip6_input.c:1.173 Mon Jan 16 15:44:47 2017
+++ src/sys/netinet6/ip6_input.c Tue Feb 21 03:59:31 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ip6_input.c,v 1.173 2017/01/16 15:44:47 christos Exp $ */
+/* $NetBSD: ip6_input.c,v 1.174 2017/02/21 03:59:31 ozaki-r Exp $ */
/* $KAME: ip6_input.c,v 1.188 2001/03/29 05:34:31 itojun Exp $ */
/*
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip6_input.c,v 1.173 2017/01/16 15:44:47 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip6_input.c,v 1.174 2017/02/21 03:59:31 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_gateway.h"
@@ -75,7 +75,6 @@ __KERNEL_RCSID(0, "$NetBSD: ip6_input.c,
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/malloc.h>
#include <sys/mbuf.h>
#include <sys/domain.h>
#include <sys/protosw.h>
