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

Commit e6faada5 authored by Amitkumar Karwar's avatar Amitkumar Karwar Committed by John W. Linville
Browse files

mwifiex: fix regression in WEP security mode 



Htcapinfo is unnecessarily sent in assoc request in WEP security due
to a regression introduced by commit 2be50b8d (mwifiex: remove
redundant encryption_mode mapping).
The issue is fixed in this patch.

Signed-off-by: default avatarAmitkumar Karwar <akarwar@marvell.com>
Signed-off-by: default avatarBing Zhao <bzhao@marvell.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 4fc5401c

drivers/net/wireless/mwifiex/cfg80211.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -960,7 +960,7 @@ mwifiex_cfg80211_assoc(struct mwifiex_private *priv, size_t ssid_len, u8 *ssid, 
		ret = mwifiex_set_gen_ie(priv, sme->ie, sme->ie_len);

		ret = mwifiex_set_gen_ie(priv, sme->ie, sme->ie_len);





	if (sme->key) {

	if (sme->key) {

		if (mwifiex_is_alg_wep(0) | mwifiex_is_alg_wep(0)) {

		if (mwifiex_is_alg_wep(priv->sec_info.encryption_mode)) {

			dev_dbg(priv->adapter->dev,

			dev_dbg(priv->adapter->dev,

				"info: setting wep encryption"

				"info: setting wep encryption"

				" with key len %d\n", sme->key_len);

				" with key len %d\n", sme->key_len);