Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/net remove extra encap_detach().



details:   https://anonhg.NetBSD.org/src/rev/d57605e6d8c1
branches:  trunk
changeset: 812164:d57605e6d8c1
user:      knakahara <knakahara%NetBSD.org@localhost>
date:      Thu Dec 03 02:50:49 2015 +0000

description:
remove extra encap_detach().

encap_detach() is already done in gif_delete_tunnel()->in{,6}_gif_detach().

diffstat:

 sys/net/if_gif.c |  10 ++--------
 1 files changed, 2 insertions(+), 8 deletions(-)

diffs (31 lines):

diff -r a0889afcc725 -r d57605e6d8c1 sys/net/if_gif.c
--- a/sys/net/if_gif.c  Thu Dec 03 02:16:00 2015 +0000
+++ b/sys/net/if_gif.c  Thu Dec 03 02:50:49 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_gif.c,v 1.92 2015/11/11 03:57:57 knakahara Exp $    */
+/*     $NetBSD: if_gif.c,v 1.93 2015/12/03 02:50:49 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.92 2015/11/11 03:57:57 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_gif.c,v 1.93 2015/12/03 02:50:49 knakahara Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -162,12 +162,6 @@
 
        gif_delete_tunnel(&sc->gif_if);
        LIST_REMOVE(sc, gif_list);
-#ifdef INET6
-       encap_detach(sc->encap_cookie6);
-#endif
-#ifdef INET
-       encap_detach(sc->encap_cookie4);
-#endif
 
        bpf_detach(ifp);
        if_detach(ifp);



Home | Main Index | Thread Index | Old Index