a unnotified conflict resolved

cf2b1802 · Francesco Mani · 8f5d4157 · cf2b1802 · cf2b1802
Commit cf2b1802 authored May 14, 2019 by Francesco Mani
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

openair2/LAYER2/NR_MAC_gNB/config.c openair2/LAYER2/NR_MAC_gNB/config.c +1 -2

openair2/LAYER2/NR_MAC_gNB/mac_proto.h openair2/LAYER2/NR_MAC_gNB/mac_proto.h +3 -2

No files found.
--- a/openair2/LAYER2/NR_MAC_gNB/config.c
+++ b/openair2/LAYER2/NR_MAC_gNB/config.c
@@ -85,8 +85,7 @@ void config_common(int Mod_idP,
                   uint64_t ssb_pattern,
 		   uint16_t ssb_periodicity,
 		   uint64_t dl_CarrierFreqP,
-                   uint32_t dl_BandwidthP
-                  ){
+                   uint32_t dl_BandwidthP){

  nfapi_nr_config_request_t *cfg = &RC.nrmac[Mod_idP]->config[CC_idP];


--- a/openair2/LAYER2/NR_MAC_gNB/mac_proto.h
+++ b/openair2/LAYER2/NR_MAC_gNB/mac_proto.h
@@ -41,6 +41,7 @@ void config_common(int Mod_idP,
 		   int Nid_cell,
                   int nr_bandP,
 		   uint64_t ssb_pattern,
+		   uint16_t ssb_periodicity,
                   uint64_t dl_CarrierFreqP,
                   uint32_t dl_BandwidthP);