[PATCH] ieee80211: Keep auth mode unchanged after iwconfig key off/on cycle

tree 2e6f6e7dc4f4eeb8e3dc265020016dd53e40578a
parent ba2075794a089430b3dd7c90ff46ce1b67e9c7cc
author Zhu Yi <yi.zhu@intel.com> 1125551043 +0800
committer James Ketrenos <jketreno@linux.intel.com> 1127314475 -0500

[Bug 768] Keep auth mode unchanged after iwconfig key off/on cycle.

Signed-off-by: Zhu Yi <yi.zhu@intel.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
This commit is contained in:
James Ketrenos 2005-09-21 11:58:38 -05:00 committed by Jeff Garzik
parent ccd0fda3a6
commit 7dc888fefc
1 changed files with 9 additions and 5 deletions

View File

@ -412,11 +412,15 @@ int ieee80211_wx_set_encode(struct ieee80211_device *ieee,
sec.flags |= SEC_ACTIVE_KEY; sec.flags |= SEC_ACTIVE_KEY;
} }
} }
ieee->open_wep = !(erq->flags & IW_ENCODE_RESTRICTED); if (erq->flags & (IW_ENCODE_OPEN | IW_ENCODE_RESTRICTED)) {
sec.auth_mode = ieee->open_wep ? WLAN_AUTH_OPEN : WLAN_AUTH_SHARED_KEY; ieee->open_wep = !(erq->flags & IW_ENCODE_RESTRICTED);
sec.flags |= SEC_AUTH_MODE; sec.auth_mode = ieee->open_wep ? WLAN_AUTH_OPEN :
IEEE80211_DEBUG_WX("Auth: %s\n", sec.auth_mode == WLAN_AUTH_OPEN ? WLAN_AUTH_SHARED_KEY;
"OPEN" : "SHARED KEY"); sec.flags |= SEC_AUTH_MODE;
IEEE80211_DEBUG_WX("Auth: %s\n",
sec.auth_mode == WLAN_AUTH_OPEN ?
"OPEN" : "SHARED KEY");
}
/* For now we just support WEP, so only set that security level... /* For now we just support WEP, so only set that security level...
* TODO: When WPA is added this is one place that needs to change */ * TODO: When WPA is added this is one place that needs to change */