This is part of adding channel frequency response. Enable debug log of
CFR component.
Change-Id: I0186129270c181c26b836b56545ef64507308808
CRs-Fixed: 2637183
According to new changes in kernel 5.4 version onwards, driver has to
provide the policy for a NL command to be verified against while
registering wiphy to the kernel.
To satisfy kernel 5.4 requirement add policy to following vendor
command as part of this change:
QCA_NL80211_VENDOR_SUBCMD_BTC_CHAIN_MODE
Change-Id: I6c6f0757df879def054862b7da09c8d7e856ff86
CRs-Fixed: 2635056
According to new changes in kernel 5.4 version onwards, driver has to
provide the policy for a NL command to be verified against while
registering wiphy to the kernel.
To satisfy kernel 5.4 requirement add policy to following vendor
commands as part of this change:
QCA_NL80211_VENDOR_SUBCMD_SPECTRAL_SCAN_START
QCA_NL80211_VENDOR_SUBCMD_SPECTRAL_SCAN_STOP
QCA_NL80211_VENDOR_SUBCMD_SPECTRAL_SCAN_GET_CONFIG
Change-Id: I2c7f4e6b41d341aac7b0984838c72f33a1e1ac5e
CRs-Fixed: 2634094
Define a dummy API for hdd_cleanup_ndi to avoid "Unknown symbol"
error while loading driver when WLAN_FEATURE_NAN is not enabled.
Change-Id: Ib0d07c5ac7e57cf93e3a20eb6d12c50106939335
CRs-Fixed: 2640856
Use INI "sta_disable_roam" to disable roaming on STA interface if
connection on other interfaces ex. p2p, ndp comes up. Each bit of
the INI "sta_disable_roam" represents an interface.
ex. LFR3_STA_ROAM_DISABLE_BY_P2P BIT(0)
LFR3_STA_ROAM_DISABLE_BY_NAN BIT(1)
As INI "sta_disable_roam" is generic for all the interfaces, cleanup
for INI "p2p_disable_roam" done.
Change-Id: Icd05a97c640ca07978d9960a33de036ed6fe38df
CRs-Fixed: 2637555
According to new changes in kernel 5.4 version onwards, driver has to
provide the policy for a NL command to ve verified against while
registering wiphy to the kernel.
To accommodate these changes, add policy for all the following
vendor commands that are being registered in the driver
QCA_NL80211_VENDOR_SUBCMD_DO_ACS
QCA_NL80211_VENDOR_SUBCMD_GET_FEATURES
Change-Id: I56d685cf3d7bab8f758d52b2e5d3c0a735accb26
CRs-Fixed: 2635226
According to new changes in kernel 5.4 version onwards, driver has to
provide the policy for a NL command to ve verified against while
registering wiphy to the kernel.
To accommodate these changes, add policy for all the following
vendor commands that are being registered in the driver
QCA_NL80211_VENDOR_SUBCMD_ROAMING
QCA_NL80211_VENDOR_SUBCMD_AVOID_FREQUENCY
QCA_NL80211_VENDOR_SUBCMD_DFS_CAPABILITY
QCA_NL80211_VENDOR_SUBCMD_NAN
QCA_NL80211_VENDOR_SUBCMD_STATS_EXT
Change-Id: Ie2fb541d45ecc04dc5d3f80a3af9060c390ae7f5
CRs-Fixed: 2634373
Currently MCS parameters are not getting correctly in
wiphy which results in incorrect capabilities for iw list
command output.
To resolve above issue, update MCS parameters correctly in
wiphy band capabilities.
CRs-Fixed: 2633314
Change-Id: I830ad50aa4842bd2a79c97ed7b11b82c35148ff0
According to new changes in kernel 5.4 version onwards, driver has to
provide the policy for a NL command to ve verified against while
registering wiphy to the kernel.
To accommodate these changes, add policy for all the following
vendor commands that are being registered in the driver
QCA_NL80211_VENDOR_SUBCMD_GET_CONCURRENCY_MATRIX
QCA_NL80211_VENDOR_SUBCMD_GET_WIFI_CONFIGURATION
QCA_NL80211_VENDOR_SUBCMD_TDLS_GET_CAPABILITIES
QCA_NL80211_VENDOR_SUBCMD_OFFLOADED_PACKETS
QCA_NL80211_VENDOR_SUBCMD_MONITOR_RSSI
Change-Id: Ia67c9c1d4839e5061f25971578830714abcd66ff
CRs-Fixed: 2633596
According to new changes in kernel 5.4 version onwards, driver has to
provide the policy for a NL command to ve verified against while
registering wiphy to the kernel.
To accommodate these changes, add policy for all the following
vendor commands that are being registered in the driver
QCA_NL80211_VENDOR_SUBCMD_SETBAND
QCA_NL80211_VENDOR_SUBCMD_SCAN_DONE
QCA_NL80211_VENDOR_SUBCMD_OTA_TEST
QCA_NL80211_VENDOR_SUBCMD_SET_TXPOWER_SCALE
QCA_NL80211_VENDOR_SUBCMD_SET_TXPOWER_SCALE_DECR_DB
QCA_NL80211_VENDOR_SUBCMD_ACS_POLICY
QCA_NL80211_VENDOR_SUBCMD_STA_CONNECT_ROAM_POLICY
QCA_NL80211_VENDOR_SUBCMD_SET_SAP_CONFIG
QCA_NL80211_VENDOR_SUBCMD_TSF
QCA_NL80211_VENDOR_SUBCMD_WISA
QCA_NL80211_VENDOR_SUBCMD_GET_STATION
QCA_NL80211_VENDOR_SUBCMD_P2P_LISTEN_OFFLOAD_START
QCA_NL80211_VENDOR_SUBCMD_P2P_LISTEN_OFFLOAD_STOP
QCA_NL80211_VENDOR_SUBCMD_SAP_CONDITIONAL_CHAN_SWITCH
Change-Id: Ibc9ec144eac63a8dab19e01c1718d17ea5cabb35
CRs-Fixed: 2633912
According to new changes in kernel 5.4 version onwards, driver has to
provide the policy for a NL command to ve verified against while
registering wiphy to the kernel.
To accommodate these changes, add policy for all the following
vendor commands that are being registered in the driver
QCA_NL80211_VENDOR_SUBCMD_GET_SUPPORTED_FEATURES
QCA_NL80211_VENDOR_SUBCMD_GET_FEATURES
QCA_NL80211_VENDOR_SUBCMD_GET_LOGGER_FEATURE_SET
QCA_NL80211_VENDOR_SUBCMD_GET_WIFI_INFO
QCA_NL80211_VENDOR_SUBCMD_GET_BUS_SIZE
QCA_NL80211_VENDOR_SUBCMD_NO_DFS_FLAG
QCA_NL80211_VENDOR_SUBCMD_LL_STATS_SET
QCA_NL80211_VENDOR_SUBCMD_SET_WIFI_CONFIGURATION
QCA_NL80211_VENDOR_SUBCMD_NAN_EXT
QCA_NL80211_VENDOR_SUBCMD_NDP
QCA_NL80211_VENDOR_SUBCMD_SCANNING_MAC_OUI
QCA_NL80211_VENDOR_SUBCMD_WIFI_LOGGER_START
QCA_NL80211_VENDOR_SUBCMD_LL_STATS_GET
QCA_NL80211_VENDOR_SUBCMD_ROAM
QCA_NL80211_VENDOR_SUBCMD_PACKET_FILTER
QCA_NL80211_VENDOR_SUBCMD_ND_OFFLOAD
QCA_NL80211_VENDOR_SUBCMD_GW_PARAM_CONFIG
QCA_NL80211_VENDOR_SUBCMD_KEY_MGMT_SET_KEY
QCA_NL80211_VENDOR_SUBCMD_GET_RING_DATA
QCA_NL80211_VENDOR_SUBCMD_TRIGGER_SCAN
Change-Id: I714c8b21a95144f7ed8ff4c6e038782e469edf3d
CRs-Fixed: 2621308
Presently vdev delete is sent to firmware 1st and the object manager
vdev delete is deleted after all the references are released.
With this change the vdev delete is sent to firmware when all the
references are released and the vdev delete is sent to firmware via
the object manager vdev delete notification.
Change-Id: I67bea0d2b2a0d2d9eb4602e5d0b8bbdcafdd4d26
CRs-Fixed: 2618278
In hdd_softap_deregister_sta, cdp_clear_peer may return fail
as peer has been deleted in other path, but the free of sta_info
will be continue.
So in hdd_softap_stop_bss, it will still access mac address
from sta_info, which will cause use after free.
Fix:
Even cdp_clear_peer return failure, it is expected, so only
log but not return failure to caller function.
In hdd_softap_stop_bss, remove mac address info log as in
hdd_softap_deregister_sta, there has been enough log for
each failure case.
Change-Id: Id06c78cb8d215488eb34d8412359ac2d684756d5
CRs-Fixed: 2637287
According to new changes in kernel 5.4 version onwards, driver has to
provide the policy for a NL command to be verified against while
registering wiphy to the kernel.
To satisfy kernel 5.4 requirement add policy to following vendor
command as part of this change:
QCA_NL80211_VENDOR_SUBCMD_SET_TRACE_LEVEL
Change-Id: Ifbeba29b5c3c7783217ed5f2352286e5537753e6
CRs-Fixed: 2633340
According to new changes in kernel 5.4 version onwards, driver has to
provide the policy for a NL command to ve verified against while
registering wiphy to the kernel.
To accommodate these changes, add policy for all the following
vendor commands that are being registered in the driver
QCA_NL80211_VENDOR_SUBCMD_TDLS_ENABLE
QCA_NL80211_VENDOR_SUBCMD_TDLS_DISABLE
QCA_NL80211_VENDOR_SUBCMD_TDLS_GET_STATUS
QCA_NL80211_VENDOR_SUBCMD_GET_SUPPORTED_FEATURES
Change-Id: I4ad3d952d2af8f1d7f37179f9c92b0e77fc2eb23
CRs-Fixed: 2635755
Add new ini CFG_SET_SAP_XLNA_BYPASS under fw_offload to allow host
to pass config to FW. WMI_PDEV_PARAM_SET_SAP_XLNA_BYPASS makes the
SAP xLNA bypass configureable.
Change-Id: Ie501005f3035f14b3f23cdd260f401a6af81b798
CRs-fixed: 2632088
These debugfs files are to replace wext cmd setUnitTestCmd
/unit_test/wlan_suspend/wlan_resume.
unit_test_host:
/sys/kernel/debug/wlan_xx/unit_test_host
wlan_xx is driver name
unit_test_target:
/sys/kernel/debug/wlan_xx/unit_test_target
wlan_xx is adapter name
wlan_suspend:
/sys/kernel/debug/wlan_xx/wlan_suspend
wlan_xx is adapter name
wlan_resume:
/sys/kernel/debug/wlan_xx/wlan_resume
wlan_xx is adapter name
Change-Id: I1ddf44b47a3f0d2e11ff74022dc1a26888da974c
CRs-Fixed: 2631424
According to new changes in kernel 5.4 version onwards, driver has to
provide the policy for a NL command to ve verified against while
registering wiphy to the kernel.
To accommodate these changes, add policy for all the following
vendor commands that are being registered in the driver
QCA_NL80211_VENDOR_SUBCMD_GET_WAKE_REASON_STATS
QCA_NL80211_VENDOR_SUBCMD_OCB_SET_CONFIG
QCA_NL80211_VENDOR_SUBCMD_OCB_SET_UTC_TIME
QCA_NL80211_VENDOR_SUBCMD_OCB_START_TIMING_ADVERT
QCA_NL80211_VENDOR_SUBCMD_OCB_STOP_TIMING_ADVERT
QCA_NL80211_VENDOR_SUBCMD_OCB_GET_TSF_TIMER
QCA_NL80211_VENDOR_SUBCMD_DCC_GET_STATS
QCA_NL80211_VENDOR_SUBCMD_DCC_CLEAR_STATS
QCA_NL80211_VENDOR_SUBCMD_DCC_UPDATE_NDL
QCA_NL80211_VENDOR_SUBCMD_LINK_PROPERTIES
Change-Id: I1fa51d2fdf75a20098fe651769352d69d8fbd48c
CRs-Fixed: 2633726
According to new changes in kernel 5.4 version onwards, driver has to
provide the policy for a NL command to ve verified against while
registering wiphy to the kernel.
To accommodate these changes, add policy for all the following
vendor commands that are being registered in the driver
QCA_NL80211_VENDOR_SUBCMD_GET_HW_CAPABILITY
QCA_NL80211_VENDOR_SUBCMD_LL_STATS_EXT
Change-Id: I33498d0980e96d7aca6c1cf3da8941654d2d6380
CRs-Fixed: 2633925
bus_bw timer start happens when first NDP is connected and
stop happens when last peer is departed indication is received
from firmware. But as part of driver unload, driver issues
stop_bss and firmware doesn't send any NDP END indication after
receiving this. So the timer started as part of first NDP confirm
is not stopped.
Try to stop the timer after processing the sme_disconnect which
is issued as part of stop_adapter for NDI mode.
Also, in STA+NDI concurrency scenario, bus bandwidth timer is
stopped on STA disconnection since hdd_any_adapter_is_assoc
checks only for other active STA or SAP. Add an NDI active
check so that timer is not stopped when NDPs are present on
an NDI.
Change-Id: Ibec447846fefad153261830c34bf2fa914636c7a
CRs-Fixed: 2625586
According to new changes in kernel 5.4 version onwards, driver has to
provide the policy for a NL command to ve verified against while
registering wiphy to the kernel.
To accommodate these changes, add policy for all the following
vendor commands that are being registered in the driver
QCA_NL80211_VENDOR_SUBCMD_EXTSCAN_START
QCA_NL80211_VENDOR_SUBCMD_EXTSCAN_STOP
QCA_NL80211_VENDOR_SUBCMD_EXTSCAN_GET_VALID_CHANNELS
QCA_NL80211_VENDOR_SUBCMD_EXTSCAN_GET_CAPABILITIES
QCA_NL80211_VENDOR_SUBCMD_EXTSCAN_GET_CACHED_RESULTS
QCA_NL80211_VENDOR_SUBCMD_EXTSCAN_SET_BSSID_HOTLIST
QCA_NL80211_VENDOR_SUBCMD_EXTSCAN_RESET_BSSID_HOTLIST
QCA_NL80211_VENDOR_SUBCMD_EXTSCAN_SET_SIGNIFICANT_CHANGE
QCA_NL80211_VENDOR_SUBCMD_EXTSCAN_RESET_SIGNIFICANT_CHANGE
QCA_NL80211_VENDOR_SUBCMD_EXTSCAN_PNO_SET_LIST
QCA_NL80211_VENDOR_SUBCMD_EXTSCAN_PNO_SET_PASSPOINT_LIST
QCA_NL80211_VENDOR_SUBCMD_EXTSCAN_PNO_RESET_PASSPOINT_LIST
Change-Id: I664e59564642c25fad931aca37cbc696b0c53b49
CRs-Fixed: 2635225
According to new changes in kernel 5.2 version onwards, driver has to
provide the policy for a NL command to be verified against while
registering wiphy to the kernel.
To satisfy kernel 5.2 requirement add policy to following vendor
command as part of this change:
QCA_NL80211_VENDOR_SUBCMD_GET_CHAIN_RSSI
Change-Id: Id1d1f1ee339bcef83b714e33cc174f886fee5ce6
CRs-Fixed: 2634263
According to new changes in kernel 5.2 version onwards, driver has to
provide the policy for a NL command to be verified against while
registering wiphy to the kernel.
To satisfy kernel 5.2 requirement add policy to following vendor
command as part of this change:
QCA_NL80211_VENDOR_SUBCMD_EXTERNAL_ACS
Change-Id: If2e7aec3d6f6d98168e0ceededea8d86db7078d9
CRs-Fixed: 2634255
In certain case, the active SAP interface will be deleted by
__wlan_hdd_del_virtual_intf by upper layer. In that case,
we need to flush pmksa in SAP PMKID cache.
Change-Id: I9a152df7a4c27aef82664f039fbca18259d6b63a
CRs-Fixed: 2635424
Currently sar safety request response event is not getting
reset before it starts wait for completion in sar
unsolicited timer callback which may cause issues if this
event gets complete multiple times.
To avoid above issue, reset the sar safety request response
event before it starts wait for completion.
CRs-Fixed: 2634885
Change-Id: I47b8abd6e960acc4dd9eef43faebe7e34203c380
The Qtime offset derived with a connected AP (master) are not
cleared on disconnect. This leads to storage of stale offset
values. So clear the stale Qtime offset values on disconnection.
Currently there is no information in ftm_time_sync sysfs entry
regarding which BSSID the Qtime offset values are derived.
Add the BSSID info in the sysfs entry.
Change-Id: Iac47bccffae005602469a658e5ca0bc9008ac4b4
CRs-Fixed: 2629822
According to new changes in kernel 5.2 version onwards, driver has to
provide the policy for a NL command to be verified against while
registering wiphy to the kernel.
To satisfy kernel 5.2 requirement add policy to following vendor
command as part of this change:
QCA_NL80211_VENDOR_SUBCMD_SET_SAR_LIMITS
Change-Id: Ic02df66a2937aa3e1fd6b6193fbe31b7b4141ba4
CRs-Fixed: 2634250
According to new changes in kernel 5.2 version onwards, driver has to
provide the policy for a NL command to be verified against while
registering wiphy to the kernel.
To satisfy kernel 5.2 requirement add policy to following vendor
command as part of this change:
QCA_NL80211_VENDOR_SUBCMD_CONFIGURE_TDLS
Change-Id: I181d9d5c4160847d4d1be98f2ce5fa2627b3972a
CRs-Fixed: 2634233
Add ini support for DFS Channel Ageout Time, the time upto which
DFS channel information such as beacon found is remembered.
This ini is used to set the ageout timer value from host to FW.
If not set, FW will disable ageout time.
This value is sent as a WMI_PDEV_PARAM_SET_DFS_CHAN_AGEOUT_TIME
as part of WMI_PDEV_SET_PARAM_CMDID.
Change-Id: I99553fa87a4025f03c52b4b387a414ba06c2c457
CRs-Fixed: 2625996
According to new changes in kernel 5.4 version onwards, driver has to
provide the policy for a NL command to be verified against while
registering wiphy to the kernel.
To satisfy kernel 5.4 requirement add policy to following vendor
command as part of this change:
QCA_NL80211_VENDOR_SUBCMD_OEM_DATA
Change-Id: Idf44f40763aa967681a3e5e9df43f259b0254b61
CRs-Fixed: 2635048
According to new changes in kernel 5.4 version onwards, driver has to
provide the policy for a NL command to be verified against while
registering wiphy to the kernel.
To satisfy kernel 5.4 requirement add policy to following vendor
command as part of this change:
QCA_NL80211_VENDOR_SUBCMD_BEACON_REPORTING
Change-Id: I2f7cba7cb16d4a13fab33398e3034e71902317f3
CRs-Fixed: 2635027
According to new changes in kernel 5.4 version onwards, driver has to
provide the policy for a NL command to be verified against while
registering wiphy to the kernel.
To satisfy kernel 5.4 requirement add policy to following vendor
command as part of this change:
QCA_NL80211_VENDOR_SUBCMD_ACTIVE_TOS
Change-Id: I915ec5494ef16e7cc5b8c42d814c512a925ef469
CRs-Fixed: 2634120
According to new changes in kernel 5.4 version onwards, driver has to
provide the policy for a NL command to be verified against while
registering wiphy to the kernel.
To satisfy kernel 5.4 requirement add policy to following vendor
command as part of this change:
QCA_NL80211_VENDOR_SUBCMD_FETCH_BSS_TRANSITION_STATUS
Change-Id: I7c49d959e7c5d232572aae78616b18cee875cbb1
CRs-Fixed: 2632084
According to new changes in kernel 5.4 version onwards, driver has to
provide the policy for a NL command to be verified against while
registering wiphy to the kernel.
To satisfy kernel 5.4 requirement add policy to following vendor
command as part of this change:
QCA_NL80211_VENDOR_SUBCMD_NUD_STATS_SET
Change-Id: I1023872146d398252cd8dbde8431cd8c5e839a31
CRs-Fixed: 2631294
Remove the excess error log in hdd_rx_deliver_to_stack. The hdd
rx/tx stats are incremented in caller for success and failed
cases for delivering the skb to network stack. This error log
is redundtant as stats for rx packets refused is incremented
when packets are dropped by the network stack.
Change-Id: I5a774db18966f9b43721278daef936de7524d6f7
CRs-Fixed: 2633475
According to new changes in kernel 5.2 version onwards, driver has to
provide the policy for a NL command to be verified against while
registering wiphy to the kernel.
To satisfy kernel 5.2 requirement add policy to following vendor
command as part of this change:
QCA_NL80211_VENDOR_SUBCMD_THERMAL_CMD
Change-Id: Ia5a5e62b3fe086c3fab58d92d12898f525f774b8
CRs-Fixed: 2631242
According to new changes in kernel 5.2 version onwards, driver has to
provide the policy for a NL command to be verified against while
registering wiphy to the kernel.
To satisfy kernel 5.2 requirement, add policy to following vendor
command as part of this change:
QCA_NL80211_VENDOR_SUBCMD_ENCRYPTION_TEST
Change-Id: I37836165dc8ff89f7179d5024cc3b1516cacf6e6
CRs-Fixed: 2633303
The function hdd_softap_deregister_sta takes the sta_info as the
argument and calls hdd_sta_info_detach. In hdd_sta_info_detach, the
memory assigned to the sta_info is being freed. For this memory to be
properly freed and set to NULL, the actual memory location must be
passed to the function; which is currently not happening.
Pass the actual memory location by reference using a double pointer so
that the memory cleanup is proper.
Change-Id: If0f846957df0378ea7a13b76bdf9c6ef562ed90e
CRs-Fixed: 2627296
Glitches seen after the STA disconnection because of the roam scan
triggered on a heartbeat failure ( beacon miss ).STA does a partial
scan followed by full scan causing the DUT to go off-channel from
the STA and P2P home channel, causing the music BLIP.
Fix is to disable roaming irrespective of data traffic present
or not on P2P interface and enabled again once P2P is disconnected.
Change-Id: I5ddf946adbfbe99d5b20c23c46b2b4ac0bfac47f
CRs-Fixed: 2632939
According to new changes in kernel 5.2 version onwards, driver has to
provide the policy for a NL command to be verified against while
registering wiphy to the kernel.
To satisfy kernel 5.2 requirement add policy to following vendor
command as part of this change:
QCA_NL80211_VENDOR_SUBCMD_MPTA_HELPER_CONFIG
Change-Id: Id83ee15ec7eb43103e44505f44fb9ff48cb23f74
CRs-Fixed: 2634109
In SAP mode, as part of dhcp inspection, sta info is fetched
using the source address of the packet irrespective of
direction. This results in sta info fetch failure in case
of dhcp tx frames where source address is self mac address
which is not registered as part of SAP start. Due to this,
when sending dhcp ack frame, tx comp flag is not set in nbuf
cb causing dhcp stop ind to be not sent to firmware.
Fix is to use dhcp client mac address to fetch sta info.
Change-Id: Ia61b93d24f3d069b40fe8ffa5ee7b6ba1e30e7c5
CRs-Fixed: 2632275
According to new changes in kernel 5.2 version onwards, driver has to
provide the policy for a NL command to be verified against while
registering wiphy to the kernel.
To satisfy kernel 5.2 requirement add policy to following vendor
command as part of this change:
QCA_NL80211_VENDOR_SUBCMD_COEX_CONFIG
Change-Id: I865ec470e1b24d1e4c5094648435ea7020a01af8
CRs-Fixed: 2634095
According to new changes in kernel 5.2 version onwards, driver has to
provide the policy for a NL command to be verified against while
registering wiphy to the kernel.
To satisfy kernel 5.2 requirement add policy to following vendor
command as part of this change:
QCA_NL80211_VENDOR_SUBCMD_WIFI_TEST_CONFIGURATION
Change-Id: I91a97a17fa27f93f20385a250f098d5b01081023
CRs-Fixed: 2634072
Currently no stats were printed related to ARP and DNS frames at STA
after initial association or after roaming complete.
To print these logs, add INI configuration and a periodic timer to
print ARP and DNS stats after initial association or after roaming
complete. This is an optional feature controlled by
'WLAN_FEATURE_PERIODIC_STA_STATS' flag.
Change-Id: I373632cc35584728c5b556bb28eda1077d51fd9b
CRs-Fixed: 2619383
User get BSS stats for the command response of GETBSSINFO. Driver saves
BSS info of the connected AP in HDD's station context. For every
association completion, driver updates BSS info stats.
In LFR3 roaming, Roam sync state in the CSR layer is set to 1 if STA
associates with new AP because of roaming. Thus for LFR3 roaming, driver
uses roam sync state to update roam count while processing association
completion.
Change-Id: Ia75f4c7b049a0546b2922d890cb3c12f6f4513a2
CRs-Fixed: 2632421
