Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop

2016-06-22 15:04:57 -07:00
parent 889262e109 7d311b57df
commit a3e1aed459
107 changed files with 12642 additions and 178 deletions
@@ -565,6 +565,7 @@ int main(int argc, char **argv)
                        n2_pucch,
                        0, //shortened_format,
                        &pucch_payload_rx, //payload,
+                        0 /* frame not defined, let's pass 0 */,
                        subframe,
                        pucch1_thres);