Merge branch 'bugfix_maxlatency_type' into 'rel'v1.2.10

Bugfix maxlatency type

See merge request tango/shaping-engine!40

1 files changed, 3 insertions, 1 deletions

diff --git a/shaping/src/shaper.cpp b/shaping/src/shaper.cpp
index 2d88b01..6a5db5e 100644
--- a/shaping/src/shaper.cpp
+++ b/shaping/src/shaper.cpp
@@ -1073,8 +1073,10 @@ int shaper_global_conf_init(struct shaping_system_conf *conf)
         LOG_ERROR("%s: shaping init global conf get CPU_AFFINITY_MASK failed or incomplete config", LOG_TAG_SHAPING);
         return -1;
     }
+    CPU_ZERO(&conf->cpu_affinity_mask);
     for (int i = 0; i < conf->work_thread_num; i++) {
-        conf->cpu_affinity_mask |= 1 << cpu_mask[i];
+        int cpu_id = cpu_mask[i];
+        CPU_SET(cpu_id, &conf->cpu_affinity_mask);
     }
 
     ret = MESA_load_profile_int_def(SHAPING_GLOBAL_CONF_FILE, "SYSTEM", "firewall_sids", &conf->firewall_sid, 1001);