Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fa7157d7 authored by Srinivas Girigowda's avatar Srinivas Girigowda Committed by Kiet Lam
Browse files

wlan: Fix mismatch between format specifiers and vos_trace_msg 

VOS_TRACE log statement should NOT have comma between
the two strings. This prevents the strings from being
concatenated as a single format string, and in fact
the 2nd string then provides the parameter for the initial "%s"
in the format string that is supposed to be filled by __func__.

Change-Id: I26d15615963874662c71ca8d97d2479f041df2bd
CRs-Fixed: 568847
parent 02797794

CORE/HDD/src/wlan_hdd_cfg.c

+2 −2
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ static void cbNotifySetRoamScanHomeAwayTime(hdd_context_t *pHddCtx, unsigned lon 
     if (pHddCtx->cfg_ini->nRoamScanHomeAwayTime < (scanChannelMaxTime + (2 * HDD_ROAM_SCAN_CHANNEL_SWITCH_TIME)))

     {

         VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_WARN,

                "%s: Invalid config, Home away time(%d) is less than (twice RF switching time + channel max time)(%d)",

                "%s: Invalid config, Home away time(%d) is less than (twice RF switching time + channel max time)(%d)"

                " Hence enforcing home away time to disable (0)",

                __func__, pHddCtx->cfg_ini->nRoamScanHomeAwayTime, (scanChannelMaxTime + (2 * HDD_ROAM_SCAN_CHANNEL_SWITCH_TIME)));

         pHddCtx->cfg_ini->nRoamScanHomeAwayTime = 0;
@@ -225,7 +225,7 @@ static void cbNotifySetNeighborScanMaxChanTime(hdd_context_t *pHddCtx, unsigned 
    if (homeAwayTime < (pHddCtx->cfg_ini->nNeighborScanMaxChanTime + (2 * HDD_ROAM_SCAN_CHANNEL_SWITCH_TIME)))

    {

        VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_WARN,

               "%s: Invalid config, Home away time(%d) is less than (twice RF switching time + channel max time)(%d)",

               "%s: Invalid config, Home away time(%d) is less than (twice RF switching time + channel max time)(%d)"

               " Hence enforcing home away time to disable (0)",

               __func__, homeAwayTime, (pHddCtx->cfg_ini->nNeighborScanMaxChanTime + (2 * HDD_ROAM_SCAN_CHANNEL_SWITCH_TIME)));

        homeAwayTime = 0;

CORE/HDD/src/wlan_hdd_main.c

+3 −2
Original line number Diff line number Diff line
@@ -1674,6 +1674,7 @@ int hdd_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) 
                  kstrtou8 fails */

               VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,

                      "%s: kstrtou8 failed Input value may be out of range[%d - %d]",

                      __func__,

                      CFG_NEIGHBOR_LOOKUP_RSSI_THRESHOLD_MIN,

                      CFG_NEIGHBOR_LOOKUP_RSSI_THRESHOLD_MAX);

               ret = -EINVAL;
@@ -2368,7 +2369,7 @@ int hdd_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) 
           if (homeAwayTime < (maxTime + (2 * HDD_ROAM_SCAN_CHANNEL_SWITCH_TIME)))

           {

               VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_WARN,

                      "%s: Invalid config, Home away time(%d) is less than (twice RF switching time + channel max time)(%d)",

                      "%s: Invalid config, Home away time(%d) is less than (twice RF switching time + channel max time)(%d)"

                      " Hence enforcing home away time to disable (0)",

                      __func__, homeAwayTime, (maxTime + (2 * HDD_ROAM_SCAN_CHANNEL_SWITCH_TIME)));

               homeAwayTime = 0;
@@ -2604,7 +2605,7 @@ int hdd_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) 
           if (homeAwayTime < (scanChannelMaxTime + (2 * HDD_ROAM_SCAN_CHANNEL_SWITCH_TIME)))

           {

               VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_WARN,

                      "%s: Invalid config, Home away time(%d) is less than (twice RF switching time + channel max time)(%d)",

                      "%s: Invalid config, Home away time(%d) is less than (twice RF switching time + channel max time)(%d)"

                      " Hence enforcing home away time to disable (0)",

                      __func__, homeAwayTime, (scanChannelMaxTime + (2 * HDD_ROAM_SCAN_CHANNEL_SWITCH_TIME)));

               homeAwayTime = 0;