From owner-p4-projects@FreeBSD.ORG  Tue Feb 19 00:42:17 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0A9BC16A420; Tue, 19 Feb 2008 00:42:17 +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 AC1E316A418
	for <perforce@freebsd.org>; Tue, 19 Feb 2008 00:42:16 +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 A12DE13C45E
	for <perforce@freebsd.org>; Tue, 19 Feb 2008 00:42:16 +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 m1J0gGCK008554
	for <perforce@freebsd.org>; Tue, 19 Feb 2008 00:42:16 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1J0gGQp008551
	for perforce@freebsd.org; Tue, 19 Feb 2008 00:42:16 GMT
	(envelope-from sam@freebsd.org)
Date: Tue, 19 Feb 2008 00:42:16 GMT
Message-Id: <200802190042.m1J0gGQp008551@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 135692 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: Tue, 19 Feb 2008 00:42:17 -0000

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

Change 135692 by sam@sam_ebb on 2008/02/19 00:41:17

	adopt sephe's idea: pass the ioctl cmd code to the reset method
	so drivers can optimize their work

Affected files ...

.. //depot/projects/vap/sys/net80211/ieee80211.c#23 edit
.. //depot/projects/vap/sys/net80211/ieee80211_ioctl.c#27 edit
.. //depot/projects/vap/sys/net80211/ieee80211_var.h#29 edit

Differences ...

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

@@ -275,7 +275,7 @@
  * can override this method to implement more optimized support.
  */
 static int
-default_reset(struct ieee80211vap *vap)
+default_reset(struct ieee80211vap *vap, u_long cmd)
 {
 	return ENETRESET;
 }

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

@@ -3171,7 +3171,7 @@
 			ieee80211_init(vap);
 		error = 0;
 	} else if (error == ERESTART) {
-		error = IFNET_IS_UP_RUNNING(ifp) ? vap->iv_reset(vap) : 0;
+		error = IFNET_IS_UP_RUNNING(ifp) ? vap->iv_reset(vap, cmd) : 0;
 	}
 	return error;
 }

==== //depot/projects/vap/sys/net80211/ieee80211_var.h#29 (text+ko) ====

@@ -398,7 +398,7 @@
 	/* beacon miss processing */
 	void			(*iv_bmiss)(struct ieee80211vap *);
 	/* reset device state after 802.11 parameter/state change */
-	int			(*iv_reset)(struct ieee80211vap *);
+	int			(*iv_reset)(struct ieee80211vap *, u_long);
 	/* [schedule] beacon frame update */
 	void			(*iv_update_beacon)(struct ieee80211vap *, int);
 	/* state machine processing */