# Conflicts:
#	common/utils/itti/intertask_interface.c
#	openair1/SCHED/phy_procedures_lte_eNb.c

# Conflicts:
#	common/utils/itti/intertask_interface.c
#	openair1/SCHED/fapi_l1.c
#	openair1/SCHED/phy_procedures_lte_eNb.c

This reverts commit c652a883.

# Conflicts:
#	openair2/LAYER2/MAC/eNB_scheduler_ulsch.c

This reverts commit 24c669f3.

Fix cqi_req_flag, to prevent continously schedule cqi after set it to 1 and before actually receive it at the right subframe.

The one in lte-enb.c disrupts the realtime. Using a B200mini with
20MHz bandwidth leads to the UE unable to connect for it seesms like
the UL and DL are not properly time synched because of this sleep
of one second that happens after the USRP streaming has started.
We see some random access attempts but the decoded preamble is
wrong.

This may be dependant on the setup. I had sporadic errors with
a B210, where sometimes the UE could connect and sometimes not.

(cherry picked from commit 5a61f994)