Commit ac4acdb7 authored by Vladimir Kondratiev's avatar Vladimir Kondratiev Committed by John W. Linville
Browse files

wil6210: send connect request IEs to FW also for non-secure connection 



Driver is sending connect request IEs to FW only for secure connection and
ignores them for non-secure connection.
This is fixed by always sending the IEs to FW upon connect request

Signed-off-by: default avatarDedy Lansky <qca_dlansky@qca.qualcomm.com>
Signed-off-by: default avatarVladimir Kondratiev <qca_vkondrat@qca.qualcomm.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent ec81b5ad

drivers/net/wireless/ath/wil6210/cfg80211.c

+11 −11
Original line number Diff line number Diff line
@@ -379,23 +379,23 @@ static int wil_cfg80211_connect(struct wiphy *wiphy, 
				sme->ie_len);

			goto out;

		}

		/*

		 * For secure assoc, send:

		 * (1) WMI_DELETE_CIPHER_KEY_CMD

		 * (2) WMI_SET_APPIE_CMD

		 */

		/* For secure assoc, send WMI_DELETE_CIPHER_KEY_CMD */

		rc = wmi_del_cipher_key(wil, 0, bss->bssid);

		if (rc) {

			wil_err(wil, "WMI_DELETE_CIPHER_KEY_CMD failed\n");

			goto out;

		}

		/* WMI_SET_APPIE_CMD */

	}



	/* WMI_SET_APPIE_CMD. ie may contain rsn info as well as other info

	 * elements. Send it also in case it's empty, to erase previously set

	 * ies in FW.

	 */

	rc = wmi_set_ie(wil, WMI_FRAME_ASSOC_REQ, sme->ie_len, sme->ie);

	if (rc) {

		wil_err(wil, "WMI_SET_APPIE_CMD failed\n");

		goto out;

	}

	}



	/* WMI_CONNECT_CMD */

	memset(&conn, 0, sizeof(conn));

drivers/net/wireless/ath/wil6210/wmi.c

+2 −0
Original line number Diff line number Diff line
@@ -972,6 +972,8 @@ int wmi_set_ie(struct wil6210_priv *wil, u8 type, u16 ie_len, const void *ie) 


	if (!cmd)

		return -ENOMEM;

	if (!ie)

		ie_len = 0;



	cmd->mgmt_frm_type = type;

	/* BUG: FW API define ieLen as u8. Will fix FW */