These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / staging / rtl8188eu / hal / odm_HWConfig.c

diff --git a/kernel/drivers/staging/rtl8188eu/hal/odm_HWConfig.c b/kernel/drivers/staging/rtl8188eu/hal/odm_HWConfig.c
index 36afe45..28b9f7f 100644 (file)
--- a/kernel/drivers/staging/rtl8188eu/hal/odm_HWConfig.c
+++ b/kernel/drivers/staging/rtl8188eu/hal/odm_HWConfig.c
@@ -362,7 +362,7 @@ static void odm_Process_RSSIForDM(struct odm_dm_struct *dm_odm,
                                }
                        }
 
-                       pEntry->rssi_stat.PacketMap = (pEntry->rssi_stat.PacketMap<<1) | BIT0;
+                       pEntry->rssi_stat.PacketMap = (pEntry->rssi_stat.PacketMap<<1) | BIT(0);
 
                } else {
                        RSSI_Ave = pPhyInfo->RxPWDBAll;
@@ -391,10 +391,10 @@ static void odm_Process_RSSIForDM(struct odm_dm_struct *dm_odm,
                        pEntry->rssi_stat.ValidBit++;
 
                for (i = 0; i < pEntry->rssi_stat.ValidBit; i++)
-                       OFDM_pkt += (u8)(pEntry->rssi_stat.PacketMap>>i)&BIT0;
+                       OFDM_pkt += (u8)(pEntry->rssi_stat.PacketMap>>i) & BIT(0);
 
                if (pEntry->rssi_stat.ValidBit == 64) {
-                       Weighting = ((OFDM_pkt<<4) > 64) ? 64 : (OFDM_pkt<<4);
+                       Weighting = min_t(u32, OFDM_pkt << 4, 64);
                        UndecoratedSmoothedPWDB = (Weighting*UndecoratedSmoothedOFDM+(64-Weighting)*UndecoratedSmoothedCCK)>>6;
                } else {
                        if (pEntry->rssi_stat.ValidBit != 0)