From owner-p4-projects@FreeBSD.ORG  Wed Mar 19 16:05:47 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3C2851065674; Wed, 19 Mar 2008 16:05:47 +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 EE4001065673
	for <perforce@freebsd.org>; Wed, 19 Mar 2008 16:05:46 +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 E3EAD8FC29
	for <perforce@freebsd.org>; Wed, 19 Mar 2008 16:05:46 +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 m2JG5kjq084440
	for <perforce@freebsd.org>; Wed, 19 Mar 2008 16:05:46 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2JG5kfi084438
	for perforce@freebsd.org; Wed, 19 Mar 2008 16:05:46 GMT
	(envelope-from sam@freebsd.org)
Date: Wed, 19 Mar 2008 16:05:46 GMT
Message-Id: <200803191605.m2JG5kfi084438@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 138103 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: Wed, 19 Mar 2008 16:05:47 -0000

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

Change 138103 by sam@sam_ebb on 2008/03/19 16:04:54

	remove timeout on disassociate event; this causes us to
	fallback on the normal event handler+state machine to
	clear the lease which is what you'd get in wired case

Affected files ...

.. //depot/projects/vap/sbin/dhclient/dhclient.c#6 edit

Differences ...

==== //depot/projects/vap/sbin/dhclient/dhclient.c#6 (text+ko) ====

@@ -278,7 +278,11 @@
 		switch (ifan->ifan_what) {
 		case RTM_IEEE80211_ASSOC:
 		case RTM_IEEE80211_REASSOC:
-			cancel_timeout(disassoc, ifi);
+			/*
+			 * Use assoc/reassoc event to kick state machine
+			 * in case we roam.  Otherwise fall back to the
+			 * normal state machine just like a wired network.
+			 */
 			jev = (struct ieee80211_join_event *) &ifan[1];
 			if (memcmp(curbssid, jev->iev_addr, 6)) {
 				disassoc(ifi);
@@ -286,22 +290,6 @@
 			}
 			memcpy(curbssid, jev->iev_addr, 6);
 			break;
-		case RTM_IEEE80211_DISASSOC:
-			/*
-			 * Defer state change in case we are re-associating
-			 * to the same ap after a deauth (e.g. due to being
-			 * idle).  We'll get an associate event and if we
-			 * roamed we'll handle it (see above).  Otherwise we'll
-			 * eventually clear state.  The only question is how
-			 * long to wait before doing this.  Give it 45 seconds
-			 * as this should be plenty to scan multiple bands
-			 * and complete a WPA handshake.  If this event is a
-			 * precursor to our being marked down or the interface
-			 * going away that'll be handled by the link state
-			 * change.
-			 */
-			add_timeout(t+45, disassoc, ifi);
-			break;
 		}
 		break;
 	default: