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

Commit e189277a authored by Volker Braun's avatar Volker Braun Committed by James Ketrenos
Browse files

Fix problem with WEP unicast key > index 0 



The functions ieee80211_wx_{get,set}_encodeext fail if one tries to set
unicast (IW_ENCODE_EXT_GROUP_KEY not set) keys at key indices>0. But at
least some Cisco APs dish out dynamic WEP unicast keys at index !=0.

Signed-off-by: default avatarVolker Braun <volker.braun@physik.hu-berlin.de>
Signed-off-by: default avatarJames Ketrenos <jketreno@linux.intel.com>
parent 81f87520

net/ieee80211/ieee80211_wx.c

+4 −2
Original line number Diff line number Diff line
@@ -522,7 +522,8 @@ int ieee80211_wx_set_encodeext(struct ieee80211_device *ieee, 
		crypt = &ieee->crypt[idx];

		group_key = 1;

	} else {

		if (idx != 0)

		/* some Cisco APs use idx>0 for unicast in dynamic WEP */

		if (idx != 0 && ext->alg != IW_ENCODE_ALG_WEP)

			return -EINVAL;

		if (ieee->iw_mode == IW_MODE_INFRA)

			crypt = &ieee->crypt[idx];
@@ -690,7 +691,8 @@ int ieee80211_wx_get_encodeext(struct ieee80211_device *ieee, 
	} else

		idx = ieee->tx_keyidx;



	if (!ext->ext_flags & IW_ENCODE_EXT_GROUP_KEY)

	if (!ext->ext_flags & IW_ENCODE_EXT_GROUP_KEY &&

	    ext->alg != IW_ENCODE_ALG_WEP)

		if (idx != 0 || ieee->iw_mode != IW_MODE_INFRA)

			return -EINVAL;