Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7dc888fe authored by James Ketrenos's avatar James Ketrenos Committed by Jeff Garzik
Browse files

[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: default avatarZhu Yi <yi.zhu@intel.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@pobox.com>
parent ccd0fda3

net/ieee80211/ieee80211_wx.c

+9 −5
Original line number Diff line number Diff line
@@ -412,11 +412,15 @@ int ieee80211_wx_set_encode(struct ieee80211_device *ieee, 
			sec.flags |= SEC_ACTIVE_KEY;

		}

	}

	if (erq->flags & (IW_ENCODE_OPEN | IW_ENCODE_RESTRICTED)) {

		ieee->open_wep = !(erq->flags & IW_ENCODE_RESTRICTED);

	sec.auth_mode = ieee->open_wep ? WLAN_AUTH_OPEN : WLAN_AUTH_SHARED_KEY;

		sec.auth_mode = ieee->open_wep ? WLAN_AUTH_OPEN :

		    WLAN_AUTH_SHARED_KEY;

		sec.flags |= SEC_AUTH_MODE;

	IEEE80211_DEBUG_WX("Auth: %s\n", sec.auth_mode == WLAN_AUTH_OPEN ?

		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...

	 * TODO: When WPA is added this is one place that needs to change */