From owner-svn-src-head@FreeBSD.ORG  Mon Jul 20 23:21:19 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E95D1106564A;
	Mon, 20 Jul 2009 23:21:19 +0000 (UTC)
	(envelope-from cokane@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D7AD08FC16;
	Mon, 20 Jul 2009 23:21:19 +0000 (UTC)
	(envelope-from cokane@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n6KNLJLP091586;
	Mon, 20 Jul 2009 23:21:19 GMT (envelope-from cokane@svn.freebsd.org)
Received: (from cokane@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n6KNLJwb091585;
	Mon, 20 Jul 2009 23:21:19 GMT (envelope-from cokane@svn.freebsd.org)
Message-Id: <200907202321.n6KNLJwb091585@svn.freebsd.org>
From: Coleman Kane <cokane@FreeBSD.org>
Date: Mon, 20 Jul 2009 23:21:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r195791 - head/sys/dev/if_ndis
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Mon, 20 Jul 2009 23:21:20 -0000

Author: cokane
Date: Mon Jul 20 23:21:19 2009
New Revision: 195791
URL: http://svn.freebsd.org/changeset/base/195791

Log:
  Fix regression in last set of commits. Submitted via e-mail and then
  nagged again via PR. Thank Paul for his persistence and contributions.
  
  PR:		136895
  Submitted by:	Paul B. Mahol <onemda@gmail.com>
  Reviewed by:	sam (timeout, 10 days), weongyo (timeout, 10 days), me
  Approved by:	re (Kostik Belousov <kostikbel@gmail.com>)

Modified:
  head/sys/dev/if_ndis/if_ndis.c

Modified: head/sys/dev/if_ndis/if_ndis.c
==============================================================================
--- head/sys/dev/if_ndis/if_ndis.c	Mon Jul 20 21:45:44 2009	(r195790)
+++ head/sys/dev/if_ndis/if_ndis.c	Mon Jul 20 23:21:19 2009	(r195791)
@@ -2292,6 +2292,8 @@ ndis_setstate_80211(sc)
 	ifp = sc->ifp;
 	ic = ifp->if_l2com;
 	vap = TAILQ_FIRST(&ic->ic_vaps);
+	if (vap == NULL)
+		return;
 
 	if (!NDIS_INITIALIZED(sc)) {
 		DPRINTF(("%s: NDIS not initialized\n", __func__));