From owner-p4-projects@FreeBSD.ORG  Mon Jan  1 04:41:45 2007
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 2DFDF16A416; Mon,  1 Jan 2007 04:41:45 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id E8CD016A407
	for <perforce@freebsd.org>; Mon,  1 Jan 2007 04:41:44 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id D90B413C448
	for <perforce@freebsd.org>; Mon,  1 Jan 2007 04:41:44 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l014fi7B067073
	for <perforce@freebsd.org>; Mon, 1 Jan 2007 04:41:44 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l014fi4a067070
	for perforce@freebsd.org; Mon, 1 Jan 2007 04:41:44 GMT
	(envelope-from kmacy@freebsd.org)
Date: Mon, 1 Jan 2007 04:41:44 GMT
Message-Id: <200701010441.l014fi4a067070@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	kmacy@freebsd.org using -f
From: Kip Macy <kmacy@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 112391 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, 01 Jan 2007 04:41:45 -0000

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

Change 112391 by kmacy@kmacy_serendipity:sam_wifi on 2007/01/01 04:41:28

	This removes calls to functions that are no longer part
	of the 802.11 stack to get GENERIC to compile - 
	not tested. I'm not sure how widely used awi is.

Affected files ...

.. //depot/projects/wifi/sys/dev/awi/awi.c#15 edit

Differences ...

==== //depot/projects/wifi/sys/dev/awi/awi.c#15 (text+ko) ====

@@ -525,9 +525,10 @@
 		if (status & AWI_INT_CMD)
 			awi_cmd_done(sc);
 		if (status & AWI_INT_SCAN_CMPLT) {
+		  /* XXX revisit scanning */
 			if (sc->sc_ic.ic_state == IEEE80211_S_SCAN &&
 			    sc->sc_substate == AWI_ST_NONE)
-				ieee80211_next_scan(&sc->sc_ic);
+			  ;
 		}
 	}
 	sc->sc_cansleep = ocansleep;
@@ -931,7 +932,6 @@
 			ifp->if_timer = 1;
 	}
 	/* TODO: rate control */
-	ieee80211_watchdog(&sc->sc_ic);
   out:
 	sc->sc_cansleep = ocansleep;
 }
@@ -1946,7 +1946,7 @@
 			case IEEE80211_S_AUTH:
 			case IEEE80211_S_ASSOC:
 			case IEEE80211_S_INIT:
-				ieee80211_begin_scan(ic, 0);
+			  /* XXX revisit scanning */;
 				break;
 			case IEEE80211_S_SCAN:
 				/* scan next */