[src/trunk]: src/sys Those were local changes not meant to be part of the rev...

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/7c6eeab19348
branches:  trunk
changeset: 813279:7c6eeab19348
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sat Jan 23 14:48:55 2016 +0000

description:
Those were local changes not meant to be part of the revert.  SORRY!

diffstat:

 sys/netinet/in_gif.c   |  19 +++++--------------
 sys/netinet6/in6_gif.c |  17 ++++-------------
 2 files changed, 9 insertions(+), 27 deletions(-)

diffs (95 lines):

diff -r 61a8c68e69bc -r 7c6eeab19348 sys/netinet/in_gif.c
--- a/sys/netinet/in_gif.c      Sat Jan 23 14:24:43 2016 +0000
+++ b/sys/netinet/in_gif.c      Sat Jan 23 14:48:55 2016 +0000
@@ -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 @@
        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 @@
        if (error == 0)
                sc->encap_cookie4 = NULL;
 
+       rtcache_free(&sc->gif_ro);
+
        return error;
 }
-#endif
-
-int
-in_gif_detach(struct gif_softc *sc)
-{
-
-       rtcache_free(&sc->gif_ro);
-
-       return 0;
-}
diff -r 61a8c68e69bc -r 7c6eeab19348 sys/netinet6/in6_gif.c
--- a/sys/netinet6/in6_gif.c    Sat Jan 23 14:24:43 2016 +0000
+++ b/sys/netinet6/in6_gif.c    Sat Jan 23 14:48:55 2016 +0000
@@ -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 @@
        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 @@
        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 *