PERFORCE change 90718 for review

[Sam Leffler]

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

Change 90718 by sam at sam_ebb on 2006/01/30 21:24:06

	fix wpa/rsn ie handling

Affected files ...

.. //depot/projects/wifi/sys/net80211/ieee80211_input.c#75 edit

Differences ...

==== //depot/projects/wifi/sys/net80211/ieee80211_input.c#75 (text+ko) ====

@@ -2505,7 +2505,7 @@
 			 * installed below after the association is assured.
 			 */
 			rsnparms = ni->ni_rsn;
-			if (wpa[0] != IEEE80211_ELEMID_RSN)
+			if (wpa != NULL)
 				reason = ieee80211_parse_wpa(ic, wpa, &rsnparms, wh);
 			else
 				reason = ieee80211_parse_rsn(ic, wpa, &rsnparms, wh);
@@ -2521,7 +2521,7 @@
 			    IEEE80211_MSG_ASSOC | IEEE80211_MSG_WPA,
 			    "[%s] %s ie: mc %u/%u uc %u/%u key %u caps 0x%x\n",
 			    ether_sprintf(wh->i_addr2),
-			    wpa[0] != IEEE80211_ELEMID_RSN ?  "WPA" : "RSN",
+			    wpa != NULL ? "WPA" : "RSN",
 			    rsnparms.rsn_mcastcipher, rsnparms.rsn_mcastkeylen,
 			    rsnparms.rsn_ucastcipher, rsnparms.rsn_ucastkeylen,
 			    rsnparms.rsn_keymgmt, rsnparms.rsn_caps);