[M] Change in libosmo-netif[master]: stream: Move some code in preparation of next commit