From owner-p4-projects@FreeBSD.ORG  Tue Dec 14 03:11:07 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4CC6316A4CE; Tue, 14 Dec 2004 03:11:07 +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 2579C16A4CE
	for <perforce@freebsd.org>; Tue, 14 Dec 2004 03:11:07 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 12FA343D2D
	for <perforce@freebsd.org>; Tue, 14 Dec 2004 03:11:07 +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 iBE3B6co001589
	for <perforce@freebsd.org>; Tue, 14 Dec 2004 03:11:06 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBE3B6Lc001586
	for perforce@freebsd.org; Tue, 14 Dec 2004 03:11:06 GMT
	(envelope-from sam@freebsd.org)
Date: Tue, 14 Dec 2004 03:11:06 GMT
Message-Id: <200412140311.iBE3B6Lc001586@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>
Subject: PERFORCE change 67017 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
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, 14 Dec 2004 03:11:07 -0000

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

Change 67017 by sam@sam_ebb on 2004/12/14 03:10:12

	o cleanup/unify debug msg for not having a xmit key
	o const'ify a memory reference

Affected files ...

.. //depot/projects/wifi/sys/net80211/ieee80211_crypto.c#7 edit

Differences ...

==== //depot/projects/wifi/sys/net80211/ieee80211_crypto.c#7 (text+ko) ====

@@ -481,8 +481,9 @@
 	    ni->ni_ucastkey.wk_cipher == &ieee80211_cipher_none) {
 		if (ic->ic_def_txkey == IEEE80211_KEYIX_NONE) {
 			IEEE80211_DPRINTF(ic, IEEE80211_MSG_CRYPTO,
-				"%s: No default xmit key for frame to %s\n",
-				__func__, ether_sprintf(wh->i_addr1));
+			    "[%s] no default transmit key (%s) deftxkey %u\n",
+			    ether_sprintf(wh->i_addr1), __func__,
+			    ic->ic_def_txkey);
 			ic->ic_stats.is_tx_nodefkey++;
 			return NULL;
 		}
@@ -511,7 +512,7 @@
 	struct ieee80211_key *k;
 	struct ieee80211_frame *wh;
 	const struct ieee80211_cipher *cip;
-	u_int8_t *ivp;
+	const u_int8_t *ivp;
 	u_int8_t keyid;
 	int hdrlen;
 
@@ -532,7 +533,7 @@
 	 */
 	wh = mtod(m, struct ieee80211_frame *);
 	hdrlen = ieee80211_hdrsize(wh);
-	ivp = mtod(m, u_int8_t *) + hdrlen;	/* XXX contig */
+	ivp = mtod(m, const u_int8_t *) + hdrlen;	/* XXX contig */
 	keyid = ivp[IEEE80211_WEP_IVLEN];
 	if (IEEE80211_IS_MULTICAST(wh->i_addr1) ||
 	    ni->ni_ucastkey.wk_cipher == &ieee80211_cipher_none)