X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=net80211%2Fieee80211_wireless.c;h=a6032daf4a715f4fe042755af2909a0862528901;hb=b7051ec95dd9b9ab2c13fd62fc3b9dff43e3010b;hp=aafa504e896d6d5ba76b56c6e1660a0226fa1e7c;hpb=e429bd14fb17b113f14c07b0ed7aa4522762e7f7;p=madwifi%2F.git

diff --git a/net80211/ieee80211_wireless.c b/net80211/ieee80211_wireless.c
index aafa504..a6032da 100644
--- a/net80211/ieee80211_wireless.c
+++ b/net80211/ieee80211_wireless.c
@@ -171,6 +171,8 @@ getiwkeyix(struct ieee80211vap *vap, const struct iw_point* erq, ieee80211_keyix
 	ieee80211_keyix_t kix;
 
 	kix = erq->flags & IW_ENCODE_INDEX;
+	if ((erq->flags & IW_ENCODE_INDEX) == (u_int8_t)IEEE80211_KEYIX_NONE)
+		kix = IEEE80211_KEYIX_NONE;
 	if (kix < 1 || kix > IEEE80211_WEP_NKID) {
 		kix = vap->iv_def_txkey;
 		if (kix == IEEE80211_KEYIX_NONE)
@@ -3397,10 +3399,10 @@ ieee80211_ioctl_delkey(struct net_device *dev, struct iw_request_info *info,
 	ieee80211_keyix_t kix;
 
 	kix = dk->idk_keyix;
+	if (dk->idk_keyix == (u_int8_t) IEEE80211_KEYIX_NONE)
+		kix = IEEE80211_KEYIX_NONE;
 
-	/* XXX: This cast can be removed when struct ieee80211req_del_key is 
-	 * fixed. */
-	if (dk->idk_keyix == IEEE80211_KEYIX_NONE) {
+	if (kix == IEEE80211_KEYIX_NONE) {
 		struct ieee80211_node *ni;
 
 		ni = ieee80211_find_node(&ic->ic_sta, dk->idk_macaddr);