From owner-p4-projects@FreeBSD.ORG Mon May 16 18:45:41 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 06D3F16A4D1; Mon, 16 May 2005 18:45:41 +0000 (GMT) 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 C00A916A4CE for ; Mon, 16 May 2005 18:45:40 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9FB2B43D83 for ; Mon, 16 May 2005 18:45:40 +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 j4GIjc9U033572 for ; Mon, 16 May 2005 18:45:38 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j4GIjcwC033569 for perforce@freebsd.org; Mon, 16 May 2005 18:45:38 GMT (envelope-from sam@freebsd.org) Date: Mon, 16 May 2005 18:45:38 GMT Message-Id: <200505161845.j4GIjcwC033569@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 77075 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 May 2005 18:45:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=77075 Change 77075 by sam@sam_laptop on 2005/05/16 18:45:14 o enable bg scanning o remove assert that's no longer valid Affected files ... .. //depot/projects/vap/sys/dev/ath/if_ath.c#12 edit Differences ... ==== //depot/projects/vap/sys/dev/ath/if_ath.c#12 (text+ko) ==== @@ -514,6 +514,7 @@ | IEEE80211_C_SHPREAMBLE /* short preamble supported */ | IEEE80211_C_SHSLOT /* short slot time supported */ | IEEE80211_C_WPA /* capable of WPA1+WPA2 */ + | IEEE80211_C_BGSCAN /* capable of bg scanning */ ; /* * Query the hal to figure out h/w crypto support. @@ -1832,8 +1833,6 @@ * TX/RX key goes at first index. * The hal handles the MIC keys are index+64. */ - KASSERT(k->wk_keyix < IEEE80211_WEP_NKID, - ("group key at index %u", k->wk_keyix)); memcpy(hk->kv_mic, k->wk_flags & IEEE80211_KEY_XMIT ? k->wk_txmic : k->wk_rxmic, sizeof(hk->kv_mic)); KEYPRINTF(sc, k->wk_keyix, hk, zerobssid);