Module Name: src
Committed By: riastradh
Date: Sat Jan 23 14:48:56 UTC 2016
Modified Files:
src/sys/netinet: in_gif.c
src/sys/netinet6: in6_gif.c
Log Message:
Those were local changes not meant to be part of the revert. SORRY!
To generate a diff of this commit:
cvs rdiff -u -r1.72 -r1.73 src/sys/netinet/in_gif.c
cvs rdiff -u -r1.69 -r1.70 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/in_gif.c
diff -u src/sys/netinet/in_gif.c:1.72 src/sys/netinet/in_gif.c:1.73
--- src/sys/netinet/in_gif.c:1.72 Sat Jan 23 02:58:13 2016
+++ src/sys/netinet/in_gif.c Sat Jan 23 14:48:55 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: in_gif.c,v 1.72 2016/01/23 02:58:13 christos Exp $ */
+/* $NetBSD: in_gif.c,v 1.73 2016/01/23 14:48:55 riastradh Exp $ */
/* $KAME: in_gif.c,v 1.66 2001/07/29 04:46:09 itojun Exp $ */
/*
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in_gif.c,v 1.72 2016/01/23 02:58:13 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in_gif.c,v 1.73 2016/01/23 14:48:55 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -391,9 +391,8 @@ in_gif_attach(struct gif_softc *sc)
return 0;
}
-#ifdef notdef
int
-in_gif_pause(struct gif_softc *sc)
+in_gif_detach(struct gif_softc *sc)
{
int error;
@@ -401,15 +400,7 @@ in_gif_pause(struct gif_softc *sc)
if (error == 0)
sc->encap_cookie4 = NULL;
- return error;
-}
-#endif
-
-int
-in_gif_detach(struct gif_softc *sc)
-{
-
rtcache_free(&sc->gif_ro);
- return 0;
+ return error;
}
Index: src/sys/netinet6/in6_gif.c
diff -u src/sys/netinet6/in6_gif.c:1.69 src/sys/netinet6/in6_gif.c:1.70
--- src/sys/netinet6/in6_gif.c:1.69 Sat Jan 23 14:03:04 2016
+++ src/sys/netinet6/in6_gif.c Sat Jan 23 14:48:55 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: in6_gif.c,v 1.69 2016/01/23 14:03:04 christos Exp $ */
+/* $NetBSD: in6_gif.c,v 1.70 2016/01/23 14:48:55 riastradh 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.69 2016/01/23 14:03:04 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6_gif.c,v 1.70 2016/01/23 14:48:55 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -384,9 +384,8 @@ in6_gif_attach(struct gif_softc *sc)
return 0;
}
-#ifdef notdef
int
-in6_gif_pause(struct gif_softc *sc)
+in6_gif_detach(struct gif_softc *sc)
{
int error;
@@ -394,17 +393,9 @@ in6_gif_pause(struct gif_softc *sc)
if (error == 0)
sc->encap_cookie6 = NULL;
- return error;
-}
-#endif
-
-int
-in6_gif_detach(struct gif_softc *sc)
-{
-
rtcache_free(&sc->gif_ro);
- return 0;
+ return error;
}
void *
