Skip to content
This repository has been archived by the owner on Apr 4, 2021. It is now read-only.

Fix some compile warnings #6

Merged
merged 1 commit into from Jun 1, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 2 additions & 4 deletions core/rtw_security.c
Expand Up @@ -1595,8 +1595,7 @@ _func_enter_;
for (j = 0 ; j < 8; j++) mic[j] = aes_out[j];

/* Insert MIC into payload */
for (j = 0; j < 8; j++)
pframe[payload_index+j] = mic[j]; //message[payload_index+j] = mic[j];
for (j = 0; j < 8; j++) pframe[payload_index+j] = mic[j]; //message[payload_index+j] = mic[j];

payload_index = hdrlen + 8;
for (i=0; i< num_blocks; i++)
Expand Down Expand Up @@ -1968,8 +1967,7 @@ _func_enter_;
for (j = 0 ; j < 8; j++) mic[j] = aes_out[j];

/* Insert MIC into payload */
for (j = 0; j < 8; j++)
message[payload_index+j] = mic[j];
for (j = 0; j < 8; j++) message[payload_index+j] = mic[j];

payload_index = hdrlen + 8;
for (i=0; i< num_blocks; i++)
Expand Down
9 changes: 6 additions & 3 deletions hal/phydm/phydm_hwconfig.c
Expand Up @@ -1509,9 +1509,13 @@ odm_RxPhyStatusJaguarSeries_Parsing(
if (i == ODM_RF_PATH_A) {
EVM = odm_EVMdbToPercentage((pPhyStaRpt->sigevm)); /*dbm*/
EVM += 20;
if (EVM > 100)
if (EVM > 100) {
EVM = 100;
}
}
} else {
// it's a made up value, but Realtek apparently assumed 'this would never happen'
EVM = 0;
}
} else {
if (i < ODM_RF_PATH_C) {
if (pPhyStaRpt->rxevm[i] == -128)
Expand Down Expand Up @@ -3185,4 +3189,3 @@ phydm_RxPhyStatusJaguarSeries2(
}
/*==============================================*/
#endif