diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-04-18 01:06:57 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-04-18 01:06:57 -0700 |
| commit | 3fc177aa54c14037fe951ce923dc0c6b2f0e4f46 (patch) | |
| tree | 927ae2a32bf8c444716a45289d510bfa89383713 | |
| parent | 66f08bb4a5d8d83dc09ffa2bbbccc749d340a015 (diff) | |
| parent | ba7586ca465a4d4e06680a760d7eb4afb33947bf (diff) | |
Merge "qcacld-2.0: fix build error on kernel 4.4.55" into wlan-cld2.driver.lnx.1.0-dev
| -rw-r--r-- | CORE/SERVICES/DFS/src/dfs_phyerr_tlv.c | 2 | ||||
| -rw-r--r-- | CORE/SME/src/csr/csrNeighborRoam.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/CORE/SERVICES/DFS/src/dfs_phyerr_tlv.c b/CORE/SERVICES/DFS/src/dfs_phyerr_tlv.c index a2e29b4e9aab..8ec07e0370cc 100644 --- a/CORE/SERVICES/DFS/src/dfs_phyerr_tlv.c +++ b/CORE/SERVICES/DFS/src/dfs_phyerr_tlv.c @@ -607,7 +607,7 @@ tlv_calc_event_freq_chirp(struct ath_dfs *dfs, struct rx_radar_status *rs, bin_resolution % 1000, radar_fft_long_period, total_bw / 100, - abs(total_bw % 100)); + (long int)abs(total_bw % 100)); #endif total_bw /= 100; /* back to KHz */ diff --git a/CORE/SME/src/csr/csrNeighborRoam.c b/CORE/SME/src/csr/csrNeighborRoam.c index 664bcd89a9bd..86463b2e06d6 100644 --- a/CORE/SME/src/csr/csrNeighborRoam.c +++ b/CORE/SME/src/csr/csrNeighborRoam.c @@ -2042,7 +2042,7 @@ csrNeighborRoamProcessScanResults(tpAniSirGlobal pMac, VOS_TRACE (VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_DEBUG, FL("Scan result: BSSID "MAC_ADDRESS_STR" (Rssi %ld, Ch:%d)"), MAC_ADDR_ARRAY(pScanResult->BssDescriptor.bssId), - abs(pScanResult->BssDescriptor.rssi), + (long int)abs(pScanResult->BssDescriptor.rssi), pScanResult->BssDescriptor.channelId); #endif if ((VOS_TRUE == vos_mem_compare(pScanResult->BssDescriptor.bssId, |