PERFORCE change 67017 for review

[Sam Leffler]

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

Change 67017 by sam at 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)