summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
| | | * | | | qcacld: Check LPASS INI configuration before send nlink messageYuanyuan Liu2014-10-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check LPASS INI configuration before send wlan status message to ADSP. Change-Id: Ie4e386d4dcf78c3335231d2a3accd216b3382dc2 CRs-Fixed: 733273
| | | * | | | qcacld: ExtScan: Honor max_channels in get_valid_channelsSrinivas Girigowda2014-10-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | One of the input parameter to get_valid_channels is max_channels. Driver need to honor this parameter and return the number of channels which is minimum of max channels or actual number of channels. Change-Id: Iaade7925bc8a6ef1a2252225598a7fd4944e7b1f CRs-Fixed: 733230
| | | * | | | qcacld: Add support for AP mode scanHaresh Eswari Lankaraman2014-10-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code changes to support the feature for scanning in AP mode. Change-Id: I6d78bd7cb121c0aeef66e29413ac7ea2f747be2c CRs-Fixed: 731198
| | | * | | | qcacld: Fix Compilation errors for x86-SDIO platformKomal Seelam2014-10-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Compilation errors for x86-SDIO platform CRs-Fixed: 729065 Change-Id: I6b9d16209712be6d50ea6877cbf886cc46d5e998
| * | | | | | Merge "Release 1.0.0.203 QCACLD WLAN Driver"Linux Build Service Account2014-10-02
| |\| | | | |
| | * | | | | Release 1.0.0.203 QCACLD WLAN DriverAkash Patel2014-10-01
| |/| | | | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/caf/caf-wlan/master' * origin/caf/caf-wlan/master: Cafstaging Release 1.0.0.203 qcacld: Fix Memory Leak in wma_mc_process_msg qcacld: TDLS: Remove duplicate channels from supported channel list Modify TXRX modules's debug logs with VOS APIs spinlock protection for tlshim_mgmt_rx_process qcacld: ExtScan: Forward beacon/probe rsp if report_events >= 2 qcacld: Fix incorrect memory allocation for BSSID qcacld: PCIe I/O RAM dump Pull method WLAN:Fix target assert with reassoc ioctl qcacld: ExtScan: Fix invalid timestamp in cached results Change-Id: I53fe91e1558ef5484a5354844c9f76bb911ec995
| | * | | | Cafstaging Release 1.0.0.203AnjaneeDevi Kapparapu2014-10-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cafstaging Release 1.0.0.203 Change-Id: I817087d497d89f70d8734e309d7c88df9039ac14 CRs-Fixed: 688141
| | * | | | qcacld: Fix Memory Leak in wma_mc_process_msgKarthick S2014-10-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Memory Leak in wma message processing CRs-Fixed: 730799 Change-Id: I96e2e2a8c960b1ad5a7943d2cdd64da9cdde7e49
| | * | | | qcacld: TDLS: Remove duplicate channels from supported channel listAtul Mittal2014-10-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While change station request, scan the supported channel list for duplicate entries and remove them to create unique list of channels. Also fix regression in preferred offchannel setting. Change-Id: Ie89d918015f57a9068b23d6b499668b6da78fa3c CRs-fixed: 731301
| | * | | | Modify TXRX modules's debug logs with VOS APIsDARAM SUDHA2014-10-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently TXRX module doesnot use VOSS API’s for logging. Replace adf_os_printf calls with VOS_TRACE with TXRX module, with appropriate log level. Change-Id: I99ae5da86ec2b5a723c46e19bef1edd3a36f65b5 CRs-FIXED: 730163
| | * | | | spinlock protection for tlshim_mgmt_rx_processDARAM SUDHA2014-10-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is a race condition happening,where two kthreads are running tlshim_mgmt_rx_process. Added a protection to avoid double free. Change-Id: I6731ca2204e171317989fcb16ebc5313abf9b063 CRs-FIXED: 724066
| | * | | | qcacld: ExtScan: Forward beacon/probe rsp if report_events >= 2Srinivas Girigowda2014-10-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change addresses the requirement of forwarding beacons/probe responses in real-time to HAL. Firmware forwards the frames to host driver with scan source id set to EXTSCAN. Based on this host driver determines this beacon/probe rsp received is as a part of EXTSCAN and forwards the same to the HAL using NL vendor events. Any beacon/probe response with IE data exceeding NL size 4k limitation; such frames shall be dropped. Change-Id: Ifd3fd70d2f9b461315981a9f1d15ef2b55f8f415 CRs-Fixed: 726133
| | * | | | qcacld: Fix incorrect memory allocation for BSSIDSrinivas Girigowda2014-10-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The sizeof(VOS_MAC_ADDR_SIZE) used to allocate bssid memory is incorrect. We should be using just VOS_MAC_ADDR_SIZE. Change-Id: I5184f0dd7c8ae2df1f5ff9d28f17f1ca4e8195ae CRs-Fixed: 732581
| | * | | | qcacld: PCIe I/O RAM dump Pull methodKomal Seelam2014-10-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If Copy Engine read fails during RAM Dump Collection, fallback to PCIe memory mapped I/O reads to collection Target Dump. CRs-Fixed: 729065 Change-Id: Ic987071807c533fd700e6c0a7027ac544191555c
| | * | | | WLAN:Fix target assert with reassoc ioctlLeela Venkata Kiran Kumar Reddy Chirala2014-10-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reassoc ioctl results in target assert due to sending add sta command to firmware when already sta is up and running this commit skips addsta for reassoc. Change-Id: I87ffb2afdae766b8b697ee193778e59ff263f785 CRs-fixed: 698968
| | * | | | qcacld: ExtScan: Fix invalid timestamp in cached resultsSrinivas Girigowda2014-10-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The expectation from the framework is to return the time since boot (in microsecond) when the BSSID was cached. Firmware returns the timestamp from WiFi turn ON till BSSID entry was cached. Host driver shall add the time gap between DUT boot up to WiFi turn ON to derive the time since boot when the BSSID was cached. Change-Id: I087bbca1051bdd92bee9405a31ed6b30cce23cf6 CRs-Fixed: 732680
| * | | | | Merge "Release 1.0.0.202 QCACLD WLAN Driver"Linux Build Service Account2014-10-01
| |\ \ \ \ \
| | * | | | | Release 1.0.0.202 QCACLD WLAN DriverAkash Patel2014-09-30
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/caf/caf-wlan/master' into HEAD * origin/caf/caf-wlan/master: Cafstaging Release 1.0.0.202 qca_cld: [cfg.ini]TxBF is off by default in host driver qcacld: Wrong VHT TX rate setting after associating wlan: Disabling logging service before nl service exit qcacld: WMA: Remove oui flag in wma qca-cld:hdd Flush scan result between scans qcacld: CL 1100895 - update fw debug log file qcacld: Fix compilation error when PMF/80211W is disabled qca_cld: improve single session max tx performance qcacld: Fix compile error on x86 USB/SDIO qcacld: Support to enable RA auto rate (0xff) qcacld: update fw common interface files Change-Id: If5094e9f7d9cd040cdca85e7b8f3d75cf73baf75
| | | * | | | Cafstaging Release 1.0.0.202AnjaneeDevi Kapparapu2014-09-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cafstaging Release 1.0.0.202 Change-Id: I80b0b78af03608bbed75654232fc94e861e535a3 CRs-Fixed: 688141
| | | * | | | qca_cld: [cfg.ini]TxBF is off by default in host driverRandy Chiu2014-09-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Turn it on by default configuration for Tufello/Rome Change-Id: I8a24cf0ae6ebdce7135d4005b352d5c2e1aa2cb6 CRs-Fixed: 725786
| | | * | | | qcacld: Wrong VHT TX rate setting after associatingRandy Chiu2014-09-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When calculating pRates->vhtTxMCSMap/pRates->vhtRxMCSMap, it should intersect with peer side pPeerVHTCaps->rxMCSMap/pPeerVHTCaps->txMCSMap to get the maximum supported MCSMap for peer side. Change-Id: Ic047c95851968ef2534fcb2772ffb7495be29359 CRs-Fixed: 730732
| | | * | | | wlan: Disabling logging service before nl service exitNeelansh Mittal2014-09-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disabling logging service before nl service exit. Thus avoiding the usage of closed nl sockets. Change-Id: I7aea77094df6ce004cd5504557617e3c56cccce7 CRs-Fixed: 724726
| | | * | | | qcacld: WMA: Remove oui flag in wmaManikandaraja Venkatachalapathy2014-09-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | oui is offloaded to framework and the explicit flag at host end to set oui can be removed. Change-Id: I55afb77c753b1aa94aca587979c08ab95da46c9d CRs-Fixed: 732044
| | | * | | | qca-cld:hdd Flush scan result between scansPeng Xu2014-09-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Scan result needs to be flushed between scans. This fix is for getting new scan result after hostapd is restarted. Change-Id: Iec5a413c30919fde0b4649c5753bb0b743037ee0 CRs-fixed: 726074
| | | * | | | qcacld: CL 1100895 - update fw debug log fileYuanyuan Liu2014-09-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add ROAM debug log id. Change-Id: Ice69f571c8a5e3eed651f5bafacc877c14d570b7 CRs-Fixed: 731143
| | | * | | | qcacld: Fix compilation error when PMF/80211W is disabledKrishna Kumaar Natarajan2014-09-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently section of a code uses the variable defined under PMF macro which causes compilation error when PMF is disabled. This change set fix the compilation error by moving the variables out of the macro WLAN_FEATURE_11W. Change-Id: I7956e1ed5a9a7bb63c4762c63fe2bbdbfe244386 CRs-Fixed: 731884
| | | * | | | qca_cld: improve single session max tx performanceLeo Chang2014-09-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Between host and firmware, tx descriptor is on the flight. This means before firmware start to drop packet, host driver may pumping more packet to firmware without packet dropping. MCC is already balanced with existing threshold. Single session case this can be applicable. Change-Id: Ifc6f3291728f97a631e7ca4da0e8a3950c2b093d CRs-fixed: 730448
| | | * | | | qcacld: Fix compile error on x86 USB/SDIOSrinivas Girigowda2014-09-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix compile error on x86 USB/SDIO Change-Id: I28f719fd4181b6fe4db4db570bc5457ad4604a1e CRs-Fixed: 731929
| | | * | | | qcacld: Support to enable RA auto rate (0xff)Srinivas Girigowda2014-09-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Firmware would expect the set_value to be passed as 0xff in order to switch to auto-rate. This change is to treat 0xff as special value and directly send down this value to firmware. Change-Id: I027ff8e2178b0e5a75ce164293f3edfe672faabc CRs-Fixed: 731914
| | | * | | | qcacld: update fw common interface filesKrishna Kumaar Natarajan2014-09-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change set update the fw common interface files associated with the CL 1099257 1100895 Change-Id: If95cbce41a1b7ca31d632c2942dc2f078c109e4f CRs-Fixed: 731943
| * | | | | | Merge "Release 1.0.0.201 QCACLD WLAN Driver"Linux Build Service Account2014-09-30
| |\| | | | |
| | * | | | | Release 1.0.0.201 QCACLD WLAN DriverAkash Patel2014-09-29
| |/| | | | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/caf/caf-wlan/master' * origin/caf/caf-wlan/master: Cafstaging Release 1.0.0.201 wlan: SME: PIP range scan fail due to incorrect length field qcacld: wma: validate wma buffer allocation length qcacld: Send 11r tlv params in roam offload for FT-Open qcacld: Update the AXI memory size for SDIO qcacld: Remove obsolete polaris/taurus/titan prop rates/IEs cnss_diag:Add support to log wlan host logs. qcacld: Add support for Rome 3.2 qcacld: Remove SAP traffic monitor feature qcacld: Fix issues observed in static code analysis QCACLD: SDIO:Swap mailbox of HTT Data and WMI control services. Change-Id: I38573dada02952e690ca67fff1e01e5dcafb75dc
| | * | | | Cafstaging Release 1.0.0.201AnjaneeDevi Kapparapu2014-09-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cafstaging Release 1.0.0.201 Change-Id: I57e408dcb1a6b1c9794d74d4b6fe79395243b1ab CRs-Fixed: 688141
| | * | | | wlan: SME: PIP range scan fail due to incorrect length fieldSiddharth Bhal2014-09-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't populate lenght field when sending eWNI_SME_OEM_DATA_REQ to firmware. This could result in memory corruption as length field is picked as last two bytes of next element of stucture i.e self mac addr. Now add length field in request struct and populate it as well. Change-Id: I5117ef4180edab23c7caaf38d948ccf23279e7f7 CRs-Fixed: 728165
| | * | | | qcacld: wma: validate wma buffer allocation lengthManikandaraja Venkatachalapathy2014-09-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Validate if command id's sent to firmware are greater than 0x800 bytes. Change-Id: I0e5ef29e28d3f90599ee103879cd9a420a205a7a CRs-Fixed: 730271
| | * | | | qcacld: Send 11r tlv params in roam offload for FT-OpenKanchanapally, Vidyullatha2014-09-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the case of FT-Open since the authentication is Open, the host misses sending the 11r tlv parameters to firmware. Fix this by sending the corresponding parameters when the authentication is open and mdie is present. Change-Id: I2274d98f3768603f1d48bf87d3b563e5eb42289a CRs-Fixed: 729996
| | * | | | qcacld: Update the AXI memory size for SDIOChandrasekaran, Manishekar2014-09-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fix updates the AXI memory size when we do core dump in SDIO Change-Id: Id9cfe8b32f424330f59c09de0f94841c1d591cb1 CRs-Fixed: 730671
| | * | | | qcacld: Remove obsolete polaris/taurus/titan prop rates/IEsSrinivas Girigowda2014-09-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We no longer support Polaris/Taurus/Titan proprietary rates/IEs. Hence remove obsolete code. Change-Id: I356254600deeab1736fb404ef6e86c7a0ef1a6fa CRs-Fixed: 710613
| | * | | | cnss_diag:Add support to log wlan host logs.Nagaraj2014-09-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Register to the Driver to recv nl messages containing wlan driver messages, diag logs and events and route them to QXDM, console and file. Modifed to support pack format specifier for double digit. CRs-Fixed: 717919 Change-Id: I904aeddf5e156ee48f0c218eb0da75b283a042d2
| | * | | | qcacld: Add support for Rome 3.2Sameer Thalappil2014-09-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update number of memory banks switched to IRAM for Rome 3.2. CRs-Fixed: 730944 Change-Id: I486cb7cdf31cad4725e00003e91ebb20be4162e4
| | * | | | qcacld: Remove SAP traffic monitor featureSrinivas Girigowda2014-09-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This feature was initially implemented on Pronto, but the same implementation does not holds good for CLD. QCACLD already supports D3 suspend in SAP mode. Hence remove this code. Change-Id: I4e7db02ccdb4cd870c1d4a57afc080ad9f76fb84 CRs-Fixed: 731104
| | * | | | qcacld: Fix issues observed in static code analysisEdhar, Mahesh Kumar2014-09-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix issues observed in static code analysis. Change-Id: I9bd007f19fb73f86d6ffe7030a796fcfbc425306 CRs-Fixed: 730750
| | * | | | QCACLD: SDIO:Swap mailbox of HTT Data and WMI control services.Edhar, Mahesh Kumar2014-09-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change HTT data service to use mailbox0 which has window size of 56k and WMI control service to use mailbox1 which has window size of 36K. dynamically change the mapping of the HTT and WMI services to swap mailboxes based on firmware support for the same. Change-Id: I45e01bfbcfb189a2a8b194040a865fead203d018 CRs-Fixed: 730152
| * | | | | Merge "Release 1.0.0.200 QCACLD WLAN Driver"Linux Build Service Account2014-09-27
| |\ \ \ \ \
| | * | | | | Release 1.0.0.200 QCACLD WLAN DriverAnjaneedevi Kapparapu2014-09-26
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/caf/caf-wlan/master' into HEAD * origin/caf/caf-wlan/master: Cafstaging Release 1.0.0.200 qcacld: p2p ie length should not exceed 251 bytes. qcacld: Fix memory leak during SoftAP SSR qcacld: WMA: pass oui data through wmi command. qcacld: HDD_UMAC: Support for set_scanning_mac_oui wlan: LFR3: GTK Rekey Host driver support Change-Id: If7e5955d74ae0a7d007580f76af6d4ed5d425f2f
| | | * | | | Cafstaging Release 1.0.0.200AnjaneeDevi Kapparapu2014-09-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cafstaging Release 1.0.0.200 Change-Id: I6e6c3878dd50c9ad0a490851b02c3d559ce691f4 CRs-Fixed: 688141
| | | * | | | qcacld: p2p ie length should not exceed 251 bytes.Ganesh Kondabattini2014-09-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Host is sometimes sending a p2p ie which is having size more than 251 bytes. Because of this target assert is happening. Adding code to check the length of p2p ie before passing it to the firmware. Change-Id: I9c20ab0b70a5a9d25d445bf815701f17a35e21ab CRs-Fixed: 730284
| | | * | | | qcacld: Fix memory leak during SoftAP SSRPrashanth Bhatta2014-09-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When SoftAP SSR is triggered, memory leaks are noticed during unloading of the driver. Fix the memory leaks. Change-Id: I579b06d0f1fc52525a7782509894b219905ac057 CRs-fixed: 730419
| | | * | | | qcacld: WMA: pass oui data through wmi command.Manikandaraja Venkatachalapathy2014-09-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The oui data that is sent from framework is passed to firmware through a new WMI command. Change-Id: I7097b91c6bb44a5e7b58e8dcd93efe49aa3a762a CRs-Fixed: 729811
| | | * | | | qcacld: HDD_UMAC: Support for set_scanning_mac_ouiSrinivas Girigowda2014-09-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Provide the support to pass 3 bytes of MAC OUI received from the android framework via the NL vendor command to wma. Change-Id: Iaeea78ad9c031a34569c932a29230250814fb6f1 CRs-Fixed: 729811