From owner-p4-projects@FreeBSD.ORG  Mon Mar  3 17:58:20 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id DBBA01065675; Mon,  3 Mar 2008 17:58:19 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9B0761065670
	for <perforce@freebsd.org>; Mon,  3 Mar 2008 17:58:19 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 9B3B18FC22
	for <perforce@freebsd.org>; Mon,  3 Mar 2008 17:58:19 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m23HwJSw069669
	for <perforce@freebsd.org>; Mon, 3 Mar 2008 17:58:19 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m23HwJax069667
	for perforce@freebsd.org; Mon, 3 Mar 2008 17:58:19 GMT
	(envelope-from sam@freebsd.org)
Date: Mon, 3 Mar 2008 17:58:19 GMT
Message-Id: <200803031758.m23HwJax069667@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 136757 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: Mon, 03 Mar 2008 17:58:20 -0000

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

Change 136757 by sam@sam_ebb on 2008/03/03 17:57:49

	Reclaim clone state on device detach; add ieee80211_vap_destroy
	that calls back through the clone code to destroy state.  Fixes
	leaking of clone state on cardbus eject.

Affected files ...

.. //depot/projects/vap/sys/net80211/ieee80211.c#27 edit
.. //depot/projects/vap/sys/net80211/ieee80211_freebsd.c#21 edit
.. //depot/projects/vap/sys/net80211/ieee80211_freebsd.h#19 edit

Differences ...

==== //depot/projects/vap/sys/net80211/ieee80211.c#27 (text+ko) ====

@@ -253,7 +253,7 @@
 
 	/* XXX ieee80211_stop_all? */
 	while ((vap = TAILQ_FIRST(&ic->ic_vaps)) != NULL)
-		ic->ic_vap_delete(vap);
+		ieee80211_vap_destroy(vap);
 
 	ieee80211_sysctl_detach(ic);
 	ieee80211_regdomain_detach(ic);

==== //depot/projects/vap/sys/net80211/ieee80211_freebsd.c#21 (text+ko) ====

@@ -100,6 +100,12 @@
 }
 IFC_SIMPLE_DECLARE(wlan, 0);
 
+void
+ieee80211_vap_destroy(struct ieee80211vap *vap)
+{
+	ifc_simple_destroy(&wlan_cloner, vap->iv_ifp);
+}
+
 static int
 ieee80211_sysctl_msecs_ticks(SYSCTL_HANDLER_ARGS)
 {

==== //depot/projects/vap/sys/net80211/ieee80211_freebsd.h#19 (text+ko) ====

@@ -208,6 +208,8 @@
 void	ieee80211_drain_ifq(struct ifqueue *);
 void	ieee80211_flush_ifq(struct ifqueue *, struct ieee80211vap *);
 
+void	ieee80211_vap_destroy(struct ieee80211vap *);
+
 #define	IFNET_IS_UP_RUNNING(_ifp) \
 	(((_ifp)->if_flags & IFF_UP) && \
 	 ((_ifp)->if_drv_flags & IFF_DRV_RUNNING))