Module Name: src
Committed By: knakahara
Date: Mon Feb 29 01:29:15 UTC 2016
Modified Files:
src/sys/netinet: ip_encap.h
src/sys/netinet6: in6_gif.c
Log Message:
remove unnecessary declarations and fix KNF
Thanks to riastradh@
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/netinet/ip_encap.h
cvs rdiff -u -r1.72 -r1.73 src/sys/netinet6/in6_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/netinet/ip_encap.h
diff -u src/sys/netinet/ip_encap.h:1.18 src/sys/netinet/ip_encap.h:1.19
--- src/sys/netinet/ip_encap.h:1.18 Fri Feb 26 07:35:17 2016
+++ src/sys/netinet/ip_encap.h Mon Feb 29 01:29:15 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_encap.h,v 1.18 2016/02/26 07:35:17 knakahara Exp $ */
+/* $NetBSD: ip_encap.h,v 1.19 2016/02/29 01:29:15 knakahara Exp $ */
/* $KAME: ip_encap.h,v 1.7 2000/03/25 07:23:37 sumikawa Exp $ */
/*
@@ -106,9 +106,6 @@ void *encap6_ctlinput(int, const struct
int encap_detach(const struct encaptab *);
void *encap_getarg(struct mbuf *);
-void encap_lock_enter(void);
-void encap_lock_exit(void);
-
#define ENCAP_PR_WRAP_CTLINPUT(name) \
static void * \
name##_wrapper(int a, const struct sockaddr *b, void *c, void *d) \
Index: src/sys/netinet6/in6_gif.c
diff -u src/sys/netinet6/in6_gif.c:1.72 src/sys/netinet6/in6_gif.c:1.73
--- src/sys/netinet6/in6_gif.c:1.72 Fri Feb 26 07:35:17 2016
+++ src/sys/netinet6/in6_gif.c Mon Feb 29 01:29:15 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: in6_gif.c,v 1.72 2016/02/26 07:35:17 knakahara Exp $ */
+/* $NetBSD: in6_gif.c,v 1.73 2016/02/29 01:29:15 knakahara Exp $ */
/* $KAME: in6_gif.c,v 1.62 2001/07/29 04:27:25 itojun Exp $ */
/*
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in6_gif.c,v 1.72 2016/02/26 07:35:17 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6_gif.c,v 1.73 2016/02/29 01:29:15 knakahara Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -398,7 +398,7 @@ in6_gif_detach(struct gif_softc *sc)
void *
in6_gif_ctlinput(int cmd, const struct sockaddr *sa, void *d, void *eparg)
{
- struct gif_softc *sc = (struct gif_softc *)eparg;
+ struct gif_softc *sc = eparg;
struct ip6ctlparam *ip6cp = NULL;
struct ip6_hdr *ip6;
const struct sockaddr_in6 *dst6;
