[src/trunk]: src/sys/net Make ifconfig destroy work if INET6 is present but n...

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

details:   https://anonhg.NetBSD.org/src/rev/73b167ea30d1
branches:  trunk
changeset: 333816:73b167ea30d1
user:      pooka <pooka%NetBSD.org@localhost>
date:      Mon Nov 17 13:58:53 2014 +0000

description:
Make ifconfig destroy work if INET6 is present but not attached

diffstat:

 sys/net/if.c |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (28 lines):

diff -r 735b40cf287e -r 73b167ea30d1 sys/net/if.c
--- a/sys/net/if.c      Mon Nov 17 10:55:42 2014 +0000
+++ b/sys/net/if.c      Mon Nov 17 13:58:53 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if.c,v 1.292 2014/11/07 12:57:42 christos Exp $        */
+/*     $NetBSD: if.c,v 1.293 2014/11/17 13:58:53 pooka Exp $   */
 
 /*-
  * Copyright (c) 1999, 2000, 2001, 2008 The NetBSD Foundation, Inc.
@@ -90,7 +90,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.292 2014/11/07 12:57:42 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.293 2014/11/17 13:58:53 pooka Exp $");
 
 #include "opt_inet.h"
 
@@ -891,7 +891,8 @@
        pktq_barrier(ip_pktq);
 #endif
 #ifdef INET6
-       pktq_barrier(ip6_pktq);
+       if (in6_present)
+               pktq_barrier(ip6_pktq);
 #endif
        xc = xc_broadcast(0, (xcfunc_t)nullop, NULL, NULL);
        xc_wait(xc);