diff --git a/src/osmo-bts-sysmo/sysmo_l1_fwd.c b/src/osmo-bts-sysmo/sysmo_l1_fwd.c
index cfb2b95..c7f2dab 100644
--- a/src/osmo-bts-sysmo/sysmo_l1_fwd.c
+++ b/src/osmo-bts-sysmo/sysmo_l1_fwd.c
@@ -119,10 +119,7 @@
 	wq->write_cb = prim_write_cb;
 	wq->read_cb = fwd_read_cb;
 
-	ofd->data = fl1h;
-	ofd->priv_nr = q;
-	ofd->when |= OSMO_FD_READ;
-
+	osmo_fd_setup(ofd, -1, OSMO_FD_READ, osmo_wqueue_bfd_cb, fl1h, q);
 	rc = osmo_sock_init_ofd(ofd, AF_UNSPEC, SOCK_DGRAM, IPPROTO_UDP,
 				bts_host, fwd_udp_ports[q],
 				OSMO_SOCK_F_CONNECT);