From owner-p4-projects@FreeBSD.ORG  Thu Nov 24 01:47:54 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 06A7F16A422; Thu, 24 Nov 2005 01:47:54 +0000 (GMT)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id CE4E316A41F
	for <perforce@freebsd.org>; Thu, 24 Nov 2005 01:47:53 +0000 (GMT)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id B9A1243D79
	for <perforce@freebsd.org>; Thu, 24 Nov 2005 01:47:42 +0000 (GMT)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jAO1lgmX029611
	for <perforce@freebsd.org>; Thu, 24 Nov 2005 01:47:42 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jAO1lgoe029608
	for perforce@freebsd.org; Thu, 24 Nov 2005 01:47:42 GMT
	(envelope-from sam@freebsd.org)
Date: Thu, 24 Nov 2005 01:47:42 GMT
Message-Id: <200511240147.jAO1lgoe029608@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 87164 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 24 Nov 2005 01:47:54 -0000

http://perforce.freebsd.org/chv.cgi?CH=87164

Change 87164 by sam@sam_ebb on 2005/11/24 01:47:36

	change assertion so we don't panic in monitor mode

Affected files ...

.. //depot/projects/wifi/sys/net80211/ieee80211_node.c#67 edit

Differences ...

==== //depot/projects/wifi/sys/net80211/ieee80211_node.c#67 (text+ko) ====

@@ -1720,9 +1720,7 @@
 	    "[%s] station with aid %d leaves\n",
 	    ether_sprintf(ni->ni_macaddr), IEEE80211_NODE_AID(ni));
 
-	KASSERT(ic->ic_opmode == IEEE80211_M_HOSTAP ||
-		ic->ic_opmode == IEEE80211_M_IBSS ||
-		ic->ic_opmode == IEEE80211_M_AHDEMO,
+	KASSERT(ic->ic_opmode != IEEE80211_M_STA,
 		("unexpected operating mode %u", ic->ic_opmode));
 	/*
 	 * If node wasn't previously associated all