From owner-p4-projects@FreeBSD.ORG  Mon Apr 23 12:18:55 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 D4C6216A40B; Mon, 23 Apr 2007 12:18:54 +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 92EB916A403
	for <perforce@FreeBSD.org>; Mon, 23 Apr 2007 12:18:54 +0000 (UTC)
	(envelope-from sephe@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 7E1DA13C4B0
	for <perforce@FreeBSD.org>; Mon, 23 Apr 2007 12:18:54 +0000 (UTC)
	(envelope-from sephe@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3NCIsQM024756
	for <perforce@FreeBSD.org>; Mon, 23 Apr 2007 12:18:54 GMT
	(envelope-from sephe@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3NCIsg9024753
	for perforce@freebsd.org; Mon, 23 Apr 2007 12:18:54 GMT
	(envelope-from sephe@FreeBSD.org)
Date: Mon, 23 Apr 2007 12:18:54 GMT
Message-Id: <200704231218.l3NCIsg9024753@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sephe@FreeBSD.org using -f
From: Sepherosa Ziehau <sephe@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 118653 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, 23 Apr 2007 12:18:55 -0000

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

Change 118653 by sephe@sephe_zealot:sam_wifi on 2007/04/23 12:18:18

	Nuke unnecessary setting of ural(4)'s security registers.  ural(4)
	only supports software encrypt/decrypt.
	
	The nuked code itself is quite problematic, as pointed out by sam@
	-- wk->wk_keyix should be replaced by the loop count.
	
	Tested with WEP/TKIP/CCMP/no-protection.
	
	Noticed-by: Hans Petter Selasky <hselasky@c2i.net>

Affected files ...

.. //depot/projects/wifi/sys/dev/usb/if_ural.c#20 edit

Differences ...

==== //depot/projects/wifi/sys/dev/usb/if_ural.c#20 (text+ko) ====

@@ -147,7 +147,7 @@
 			    int);
 static void		ural_write(struct ural_softc *, uint16_t, uint16_t);
 static void		ural_write_multi(struct ural_softc *, uint16_t, void *,
-			    int);
+			    int) __unused;
 static void		ural_bbp_write(struct ural_softc *, uint8_t, uint8_t);
 static uint8_t		ural_bbp_read(struct ural_softc *, uint8_t);
 static void		ural_rf_write(struct ural_softc *, uint8_t, uint32_t);
@@ -2205,7 +2205,6 @@
 	struct ural_softc *sc = priv;
 	struct ieee80211com *ic = &sc->sc_ic;
 	struct ifnet *ifp = ic->ic_ifp;
-	struct ieee80211_key *wk;
 	struct ural_rx_data *data;
 	uint16_t tmp;
 	usbd_status error;
@@ -2255,15 +2254,6 @@
 	ural_set_macaddr(sc, ic->ic_myaddr);
 
 	/*
-	 * Copy WEP keys into adapter's memory (SEC_CSR0 to SEC_CSR31).
-	 */
-	for (i = 0; i < IEEE80211_WEP_NKID; i++) {
-		wk = &ic->ic_crypto.cs_nw_keys[i];
-		ural_write_multi(sc, wk->wk_keyix * IEEE80211_KEYBUF_SIZE +
-		    RAL_SEC_CSR0, wk->wk_key, IEEE80211_KEYBUF_SIZE);
-	}
-
-	/*
 	 * Allocate xfer for AMRR statistics requests.
 	 */
 	sc->amrr_xfer = usbd_alloc_xfer(sc->sc_udev);