From owner-svn-src-head@FreeBSD.ORG  Thu Oct 10 09:43:15 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id B99EA9A3;
 Thu, 10 Oct 2013 09:43:15 +0000 (UTC) (envelope-from hrs@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id A81742D64;
 Thu, 10 Oct 2013 09:43:15 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9A9hFs5018556;
 Thu, 10 Oct 2013 09:43:15 GMT (envelope-from hrs@svn.freebsd.org)
Received: (from hrs@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9A9hFfM018555;
 Thu, 10 Oct 2013 09:43:15 GMT (envelope-from hrs@svn.freebsd.org)
Message-Id: <201310100943.r9A9hFfM018555@svn.freebsd.org>
From: Hiroki Sato <hrs@FreeBSD.org>
Date: Thu, 10 Oct 2013 09:43:15 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r256258 - head/sys/netinet6
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 10 Oct 2013 09:43:15 -0000

Author: hrs
Date: Thu Oct 10 09:43:15 2013
New Revision: 256258
URL: http://svnweb.freebsd.org/changeset/base/256258

Log:
  Do not try to detach if the interface does not support IPv6.
  
  Tested by:	hselasky
  PR:		usb/182820
  Approved by:	re (glebius)

Modified:
  head/sys/netinet6/in6_ifattach.c

Modified: head/sys/netinet6/in6_ifattach.c
==============================================================================
--- head/sys/netinet6/in6_ifattach.c	Thu Oct 10 09:42:41 2013	(r256257)
+++ head/sys/netinet6/in6_ifattach.c	Thu Oct 10 09:43:15 2013	(r256258)
@@ -809,6 +809,9 @@ in6_ifdetach(struct ifnet *ifp)
 	struct sockaddr_in6 sin6;
 	struct in6_multi_mship *imm;
 
+	if (ifp->if_afdata[AF_INET6] == NULL)
+		return;
+
 	/* remove neighbor management table */
 	nd6_purge(ifp);