diff options
| author | Mohammad Asaad Akram <asadkrm@codeaurora.org> | 2020-10-30 13:10:51 +0530 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2020-11-26 00:08:31 -0800 |
| commit | bb0f006bd456d1953b312905d3c20c031555d4f8 (patch) | |
| tree | 34f50791f8ec488c1cb7235d02c2da47aa676fdc | |
| parent | 3e54543bdac9698ae1f0d5eca01380e7bee28269 (diff) | |
wpas_8_lib: fix qca-vendor enum attributes
This patch fixes the wpa_supplicant_8_lib to use qca-vendor.h
definition instead of local one.
Change-Id: I91fd3af326eb2dbb6c10f39c635e55ac3d8d9c93
CRs-Fixed: 2809077
| -rw-r--r-- | qcwcn/wpa_supplicant_8_lib/driver_cmd_nl80211.c | 12 | ||||
| -rw-r--r-- | qcwcn/wpa_supplicant_8_lib/wpa_driver_common_lib.h | 17 |
2 files changed, 6 insertions, 23 deletions
diff --git a/qcwcn/wpa_supplicant_8_lib/driver_cmd_nl80211.c b/qcwcn/wpa_supplicant_8_lib/driver_cmd_nl80211.c index 75b0735..a0a1c6e 100644 --- a/qcwcn/wpa_supplicant_8_lib/driver_cmd_nl80211.c +++ b/qcwcn/wpa_supplicant_8_lib/driver_cmd_nl80211.c @@ -640,11 +640,11 @@ static int parse_and_populate_setcellswitchmode(struct nl_msg *nlmsg, QCA_ROAM_TRIGGER_REASON_DENSE | QCA_ROAM_TRIGGER_REASON_BTM | QCA_ROAM_TRIGGER_REASON_BSS_LOAD | - QCA_ROAM_TRIGGER_REASON_USER_TRIGGER_TMP | - QCA_ROAM_TRIGGER_REASON_DEAUTH_TMP | - QCA_ROAM_TRIGGER_REASON_IDLE_TMP | - QCA_ROAM_TRIGGER_REASON_TX_FAILURES_TMP | - QCA_ROAM_TRIGGER_REASON_EXTERNAL_SCAN_TMP; + QCA_ROAM_TRIGGER_REASON_USER_TRIGGER | + QCA_ROAM_TRIGGER_REASON_DEAUTH | + QCA_ROAM_TRIGGER_REASON_IDLE | + QCA_ROAM_TRIGGER_REASON_TX_FAILURES | + QCA_ROAM_TRIGGER_REASON_EXTERNAL_SCAN; scan_scheme_bitmap = QCA_ROAM_TRIGGER_REASON_PER | QCA_ROAM_TRIGGER_REASON_BEACON_MISS | @@ -678,7 +678,7 @@ static int parse_and_populate_setcellswitchmode(struct nl_msg *nlmsg, break; case 2: if (nla_put_u32(nlmsg, QCA_ATTR_ROAM_CONTROL_TRIGGERS, all_trigger_bitmap) || - nla_put_u32(nlmsg, QCA_ATTR_ROAM_CONTROL_SCAN_SCHEME_TRIGGERS_TMP, scan_scheme_bitmap)) { + nla_put_u32(nlmsg, QCA_ATTR_ROAM_CONTROL_SCAN_SCHEME_TRIGGERS, scan_scheme_bitmap)) { wpa_printf(MSG_ERROR,"Failed to set: ROAM_CONTROL_TRIGGERS_SCAN_SCHEME"); goto fail; } diff --git a/qcwcn/wpa_supplicant_8_lib/wpa_driver_common_lib.h b/qcwcn/wpa_supplicant_8_lib/wpa_driver_common_lib.h index c4783c8..ee335ac 100644 --- a/qcwcn/wpa_supplicant_8_lib/wpa_driver_common_lib.h +++ b/qcwcn/wpa_supplicant_8_lib/wpa_driver_common_lib.h @@ -121,23 +121,6 @@ enum qca_wlan_vendor_attr_get_station { QCA_WLAN_VENDOR_ATTR_GET_STATION_AFTER_LAST - 1, }; -/* -these enum changes are temporary, shall be removed when -updated wpa_supplicant_8/src/common/qca-vendor.h is available -*/ - -enum qca_roam_control_scheme_tmp{ - QCA_ATTR_ROAM_CONTROL_SCAN_SCHEME_TRIGGERS_TMP = 13, -}; - -enum qca_roam_trigger_reasons_tmp { - QCA_ROAM_TRIGGER_REASON_USER_TRIGGER_TMP = 1 << 8, - QCA_ROAM_TRIGGER_REASON_DEAUTH_TMP = 1 << 9, - QCA_ROAM_TRIGGER_REASON_IDLE_TMP = 1 << 10, - QCA_ROAM_TRIGGER_REASON_TX_FAILURES_TMP = 1 << 11, - QCA_ROAM_TRIGGER_REASON_EXTERNAL_SCAN_TMP = 1 << 12, -}; - /** * enum qca_wlan_vendor_attr_get_station_info - Station Info queried * through QCA_NL80211_VENDOR_SUBCMD_GET_STATION. |