diff options
| author | Harald Welte <laforge@osmocom.org> | 2020-10-19 12:59:13 +0200 |
|---|---|---|
| committer | laforge <laforge@osmocom.org> | 2020-11-11 20:15:37 +0000 |
| commit | 2bbdf2e3d75101e1ddeb4f244c180976010985c6 (patch) | |
| tree | 03a49fed7a20b227bc94f0698c405f824b21587a | |
| parent | cb98894eb1d9dfa8a2b040224a0a5605db38a2cf (diff) | |
Use osmo_fd_*_{disable,enable}
Change-Id: I16563a1033ad12a32104bfee974045ac4302bc74
Depends: libosmocore.git Idb89ba7bc7c129a6304a76900d17f47daf54d17d
| -rw-r--r-- | TODO-RELEASE | 1 | ||||
| -rw-r--r-- | src/osmobts_sock.cpp | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/TODO-RELEASE b/TODO-RELEASE index 17c6a348..40932ee8 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -8,3 +8,4 @@ # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line osmo-pcu update osmo-gsm-manuals dependency to > 0.3.0 for vty_cpu_sched.adoc include +osmo-pcu update libosmocore dependency > 1.4.x for osmo_fd_{read,write}_{enable,disable} diff --git a/src/osmobts_sock.cpp b/src/osmobts_sock.cpp index c9beff05..522581a4 100644 --- a/src/osmobts_sock.cpp +++ b/src/osmobts_sock.cpp @@ -82,7 +82,7 @@ int pcu_sock_send(struct msgb *msg) return -EIO; } msgb_enqueue(&pcu_sock_state.upqueue, msg); - conn_bfd->when |= OSMO_FD_WRITE; + osmo_fd_write_enable(conn_bfd); return 0; } @@ -153,7 +153,7 @@ static int pcu_sock_write(struct osmo_fd *bfd) msg = llist_entry(pcu_sock_state.upqueue.next, struct msgb, list); pcu_prim = (struct gsm_pcu_if *)msg->data; - bfd->when &= ~OSMO_FD_WRITE; + osmo_fd_write_disable(bfd); /* bug hunter 8-): maybe someone forgot msgb_put(...) ? */ if (!msgb_length(msg)) { @@ -168,7 +168,7 @@ static int pcu_sock_write(struct osmo_fd *bfd) goto close; if (rc < 0) { if (errno == EAGAIN) { - bfd->when |= OSMO_FD_WRITE; + osmo_fd_write_enable(bfd); break; } goto close; |