<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-el2tpd/+/20741">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  laforge: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Use OSMO_FD_* instead of deprecated BSC_FD_*<br><br>Change-Id: I0b4400a2a5b7cd0d670db81d17579dbd34f3eb48<br>---<br>M src/l2tpd.c<br>M src/l2tpd_socket.c<br>M src/test_connect.c<br>3 files changed, 4 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/l2tpd.c b/src/l2tpd.c</span><br><span>index 9d09dba..635394d 100644</span><br><span>--- a/src/l2tpd.c</span><br><span>+++ b/src/l2tpd.c</span><br><span>@@ -88,7 +88,7 @@</span><br><span> </span><br><span>     INIT_LLIST_HEAD(&li->connections);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   li->l2tp_ofd.when = BSC_FD_READ;</span><br><span style="color: hsl(120, 100%, 40%);">+   li->l2tp_ofd.when = OSMO_FD_READ;</span><br><span>         li->l2tp_ofd.cb = l2tp_ip_read_cb;</span><br><span>        li->l2tp_ofd.data = li;</span><br><span> </span><br><span>diff --git a/src/l2tpd_socket.c b/src/l2tpd_socket.c</span><br><span>index a9ff563..efdb482 100644</span><br><span>--- a/src/l2tpd_socket.c</span><br><span>+++ b/src/l2tpd_socket.c</span><br><span>@@ -84,7 +84,7 @@</span><br><span>      }</span><br><span> </span><br><span>        conn_bfd->fd = rc;</span><br><span style="color: hsl(0, 100%, 40%);">-   conn_bfd->when = BSC_FD_READ;</span><br><span style="color: hsl(120, 100%, 40%);">+      conn_bfd->when = OSMO_FD_READ;</span><br><span> </span><br><span>        if (osmo_fd_register(conn_bfd) != 0) {</span><br><span>               LOGP(state->log_class, LOGL_ERROR, "Failed to register new connection fd\n");</span><br><span>@@ -142,7 +142,7 @@</span><br><span>             return -1;</span><br><span>   }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   bfd->when = BSC_FD_READ;</span><br><span style="color: hsl(120, 100%, 40%);">+   bfd->when = OSMO_FD_READ;</span><br><span>         bfd->cb = l2tp_sock_accept;</span><br><span> </span><br><span>   rc = osmo_fd_register(bfd);</span><br><span>diff --git a/src/test_connect.c b/src/test_connect.c</span><br><span>index 38aa127..5eb584b 100644</span><br><span>--- a/src/test_connect.c</span><br><span>+++ b/src/test_connect.c</span><br><span>@@ -58,7 +58,7 @@</span><br><span> {</span><br><span>    int rc = 0;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- bfd->when = BSC_FD_READ;</span><br><span style="color: hsl(120, 100%, 40%);">+   bfd->when = OSMO_FD_READ;</span><br><span>         bfd->cb = socket_read;</span><br><span>    bfd->fd = osmo_sock_unix_init(SOCK_SEQPACKET, 0, sock_path,OSMO_SOCK_F_CONNECT);</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-el2tpd/+/20741">change 20741</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-el2tpd/+/20741"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-el2tpd </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I0b4400a2a5b7cd0d670db81d17579dbd34f3eb48 </div>
<div style="display:none"> Gerrit-Change-Number: 20741 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>