Source-Changes-HG archive

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

[src/trunk]: src/sys/net fix CID 980463



details:   https://anonhg.NetBSD.org/src/rev/25dda199575f
branches:  trunk
changeset: 341544:25dda199575f
user:      knakahara <knakahara%NetBSD.org@localhost>
date:      Wed Nov 11 03:57:57 2015 +0000

description:
fix CID 980463

diffstat:

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

diffs (40 lines):

diff -r 0dc51fdc4a61 -r 25dda199575f sys/net/if_gif.c
--- a/sys/net/if_gif.c  Wed Nov 11 03:14:34 2015 +0000
+++ b/sys/net/if_gif.c  Wed Nov 11 03:57:57 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_gif.c,v 1.91 2015/11/11 02:57:17 knakahara Exp $    */
+/*     $NetBSD: if_gif.c,v 1.92 2015/11/11 03:57:57 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.91 2015/11/11 02:57:17 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_gif.c,v 1.92 2015/11/11 03:57:57 knakahara Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -747,7 +747,6 @@
        if (odst)
                sockaddr_free(odst);
 
-       ifp->if_flags |= IFF_RUNNING;
        error = 0;
        goto out;
 
@@ -764,11 +763,12 @@
                sc->gif_si = NULL;
        }
 
+out:
        if (sc->gif_psrc && sc->gif_pdst)
                ifp->if_flags |= IFF_RUNNING;
        else
                ifp->if_flags &= ~IFF_RUNNING;
-out:
+
        splx(s);
        return error;
 }



Home | Main Index | Thread Index | Old Index