diff options
| author | Srinivas Dasari <dasaris@codeaurora.org> | 2018-06-14 16:55:55 +0530 |
|---|---|---|
| committer | Ahmed ElArabawy <arabawy@google.com> | 2019-01-16 08:48:46 -0800 |
| commit | affb8bde8d8251d653867686fe5b58541f198312 (patch) | |
| tree | bf03bb50e336647619390a19bcc4e63b789dc428 /qcwcn/wifi_hal/radio_mode.cpp | |
| parent | ac0df74f0f9453ed5c4bead6a7e7c34650e300b4 (diff) | |
| download | wlan-affb8bde8d8251d653867686fe5b58541f198312.tar.gz | |
WiFi-Hal: Sync qca-vendor_copy.h to upstream qca-vendor.h
Sync qca-vendor_copy.h to upstream qca-vendor.h and remove
duplicate enums/defines from vendor_definitions.h
Bug: 121155020
Test: Manual
CRs-Fixed: 2290651
Change-Id: I44e1c955ff2e4b207063ce5d7b88bb2bb8fb4ed6
Diffstat (limited to 'qcwcn/wifi_hal/radio_mode.cpp')
| -rw-r--r-- | qcwcn/wifi_hal/radio_mode.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/qcwcn/wifi_hal/radio_mode.cpp b/qcwcn/wifi_hal/radio_mode.cpp index 96a2176..dc5969d 100644 --- a/qcwcn/wifi_hal/radio_mode.cpp +++ b/qcwcn/wifi_hal/radio_mode.cpp @@ -84,7 +84,7 @@ RADIOModeCommand* RADIOModeCommand::instance(wifi_handle handle, } mRADIOModeCommandInstance = new RADIOModeCommand(handle, id, OUI_QCA, - QCA_NL80211_VENDOR_SUBCMD_WLAN_MAC_MODE); + QCA_NL80211_VENDOR_SUBCMD_WLAN_MAC_INFO); return mRADIOModeCommandInstance; } @@ -102,7 +102,7 @@ int RADIOModeCommand::handleEvent(WifiEvent &event) /* Parse the vendordata and get the attribute */ switch(mSubcmd) { - case QCA_NL80211_VENDOR_SUBCMD_WLAN_MAC_MODE: + case QCA_NL80211_VENDOR_SUBCMD_WLAN_MAC_INFO: { struct nlattr *mtb_vendor[QCA_WLAN_VENDOR_ATTR_MAC_MAX + 1]; struct nlattr *modeInfo; @@ -155,17 +155,17 @@ int RADIOModeCommand::handleEvent(WifiEvent &event) nla_parse(tb3, QCA_WLAN_VENDOR_ATTR_MAC_IFACE_INFO_MAX, (struct nlattr *) nla_data(tb_iface), nla_len(tb_iface), NULL); - if (!tb3[QCA_WLAN_VENDOR_ATTR_MAC_IFACE_INFO_ID]) + if (!tb3[QCA_WLAN_VENDOR_ATTR_MAC_IFACE_INFO_IFINDEX]) { - ALOGE("%s: QCA_WLAN_VENDOR_ATTR_MAC_IFACE_INFO_ID" + ALOGE("%s: QCA_WLAN_VENDOR_ATTR_MAC_IFACE_INFO_IFINDEX" " NOT FOUND", __FUNCTION__); return WIFI_ERROR_INVALID_ARGS; } - if (if_indextoname(nla_get_u32(tb3[QCA_WLAN_VENDOR_ATTR_MAC_IFACE_INFO_ID]), + if (if_indextoname(nla_get_u32(tb3[QCA_WLAN_VENDOR_ATTR_MAC_IFACE_INFO_IFINDEX]), miface_info.iface_name) == NULL) { ALOGE("%s: Failed to convert %d IFINDEX to IFNAME", __FUNCTION__, - nla_get_u32(tb3[QCA_WLAN_VENDOR_ATTR_MAC_IFACE_INFO_ID])); + nla_get_u32(tb3[QCA_WLAN_VENDOR_ATTR_MAC_IFACE_INFO_IFINDEX])); } ALOGV("ifname[%d]: %s ", num_of_iface, miface_info.iface_name); @@ -233,7 +233,7 @@ wifi_error wifi_set_radio_mode_change_handler(wifi_request_id id, RADIOModeCommand *radiomodeCommand; ret = initialize_vendor_cmd(iface, id, - QCA_NL80211_VENDOR_SUBCMD_WLAN_MAC_MODE, + QCA_NL80211_VENDOR_SUBCMD_WLAN_MAC_INFO, &vCommand); if (ret != WIFI_SUCCESS) { ALOGE("%s: Initialization failed", __FUNCTION__); |