qcacld-3.0: Update correct authtype during connect

Currently the authtype is not getting updated properly in case
of wpa2psk security mode, this change will update the correct
auth type

Change-Id: I11d15457b375ed2803420cfd08070a7bbc181029
CRs-Fixed: 1044021
Цей коміт міститься в:
Anurag Chouhan
2016-07-20 17:45:48 +05:30
зафіксовано Nandini Suresh
джерело 2048997252
коміт d939d3decd
4 змінених файлів з 9 додано та 30 видалено

Переглянути файл

@@ -90,32 +90,6 @@ void cds_set_driver_state(enum cds_driver_state);
void cds_clear_driver_state(enum cds_driver_state); void cds_clear_driver_state(enum cds_driver_state);
enum cds_driver_state cds_get_driver_state(void); enum cds_driver_state cds_get_driver_state(void);
/**
* cds_get_u16()- get 16 bit data in little endian
* @ptr: buffer that holds data
*
* Return: uint16_t data in little endian format
*/
static inline uint16_t cds_get_u16(uint8_t *ptr)
{
return ((uint16_t) (*(ptr+1) << 8)) |
((uint16_t) (*ptr));
}
/**
* cds_get_u32()- get 32 bit data in little endian
* @ptr: buffer that holds data
*
* Return: uint32_t data in little endian format
*/
static inline uint32_t cds_get_u32(uint8_t *ptr)
{
return (*(ptr+3) << 24) |
(*(ptr+2) << 16) |
(*(ptr+1) << 8) |
(*(ptr));
}
/** /**
* cds_is_driver_loading() - Is driver load in progress * cds_is_driver_loading() - Is driver load in progress
* *

Переглянути файл

@@ -99,6 +99,8 @@ typedef enum {
* @ht_present: ht element present or not * @ht_present: ht element present or not
* @vht_present: vht element present or not * @vht_present: vht element present or not
* @hs20_present: hs20 element present or not * @hs20_present: hs20 element present or not
* @ht_op_present: ht operation present or not
* @vht_op_present: vht operation present or not
*/ */
struct hdd_conn_flag { struct hdd_conn_flag {
uint8_t ht_present:1; uint8_t ht_present:1;
@@ -173,7 +175,7 @@ struct hdd_conn_flag {
* @ht_caps: holds ht capabilities info * @ht_caps: holds ht capabilities info
* @vht_caps: holds vht capabilities info * @vht_caps: holds vht capabilities info
* @hs20vendor_ie: holds passpoint/hs20 info * @hs20vendor_ie: holds passpoint/hs20 info
* @hdd_conn_flag: flag conn info params is present or not * @conn_flag: flag conn info params is present or not
* @roam_count: roaming counter * @roam_count: roaming counter
* @signal: holds rssi info * @signal: holds rssi info
* @assoc_status_code: holds assoc fail reason * @assoc_status_code: holds assoc fail reason

Переглянути файл

@@ -3328,7 +3328,7 @@ fail:
* *
* Return: Success(0) or reason code for failure * Return: Success(0) or reason code for failure
*/ */
static int32_t static int
__hdd_cfg80211_get_station_cmd(struct wiphy *wiphy, __hdd_cfg80211_get_station_cmd(struct wiphy *wiphy,
struct wireless_dev *wdev, struct wireless_dev *wdev,
const void *data, const void *data,
@@ -9465,8 +9465,8 @@ int wlan_hdd_cfg80211_connect_start(hdd_adapter_t *pAdapter,
} }
pRoamProfile = &pWextState->roamProfile; pRoamProfile = &pWextState->roamProfile;
qdf_mem_zero(&hdd_sta_ctx->conn_info, qdf_mem_zero(&hdd_sta_ctx->conn_info.conn_flag,
sizeof(hdd_sta_ctx->conn_info)); sizeof(hdd_sta_ctx->conn_info.conn_flag));
if (pRoamProfile) { if (pRoamProfile) {
hdd_station_ctx_t *pHddStaCtx; hdd_station_ctx_t *pHddStaCtx;

Переглянути файл

@@ -406,8 +406,10 @@ enum qca_nl80211_vendor_subcmds {
* latest cached information during the connected state , if queried * latest cached information during the connected state , if queried
* when in disconnected state. * when in disconnected state.
* *
* @QCA_WLAN_VENDOR_ATTR_GET_STATION_INVALID: Invalid attribute
* @QCA_WLAN_VENDOR_ATTR_GET_STATION_INFO: bss info * @QCA_WLAN_VENDOR_ATTR_GET_STATION_INFO: bss info
* @QCA_WLAN_VENDOR_ATTR_GET_STATION_ASSOC_FAIL_REASON: assoc fail reason * @QCA_WLAN_VENDOR_ATTR_GET_STATION_ASSOC_FAIL_REASON: assoc fail reason
* @QCA_WLAN_VENDOR_ATTR_GET_STATION_AFTER_LAST: After last
*/ */
enum qca_wlan_vendor_attr_get_station { enum qca_wlan_vendor_attr_get_station {
QCA_WLAN_VENDOR_ATTR_GET_STATION_INVALID = 0, QCA_WLAN_VENDOR_ATTR_GET_STATION_INVALID = 0,
@@ -504,6 +506,7 @@ enum qca_wlan_auth_type {
* @QCA_WLAN_VENDOR_ATTR_GET_STATION_INFO_ASSOC_FAIL_REASON: * @QCA_WLAN_VENDOR_ATTR_GET_STATION_INFO_ASSOC_FAIL_REASON:
* Status Code Corresponding to the Association Failure. * Status Code Corresponding to the Association Failure.
* Unsigned 32 bit value. * Unsigned 32 bit value.
* @QCA_WLAN_VENDOR_ATTR_GET_STATION_INFO_AFTER_LAST: After last
*/ */
enum qca_wlan_vendor_attr_get_station_info { enum qca_wlan_vendor_attr_get_station_info {
QCA_WLAN_VENDOR_ATTR_GET_STATION_INFO_INVALID = 0, QCA_WLAN_VENDOR_ATTR_GET_STATION_INFO_INVALID = 0,