<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ggsn/+/20742">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Use OSMO_FD_* instead of deprecated BSC_FD_*<br><br>Change-Id: Ib660cbbeafd8f4077c693d53127ecd1c15455455<br>---<br>M ggsn/ggsn.c<br>1 file changed, 6 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/42/20742/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/ggsn/ggsn.c b/ggsn/ggsn.c</span><br><span>index 159362f..267637d 100644</span><br><span>--- a/ggsn/ggsn.c</span><br><span>+++ b/ggsn/ggsn.c</span><br><span>@@ -194,7 +194,7 @@</span><br><span>                LOGPAPN(LOGL_INFO, apn, "Opened TUN device %s\n", apn->tun.tun->devname);</span><br><span> </span><br><span>                /* Register with libosmcoore */</span><br><span style="color: hsl(0, 100%, 40%);">-         osmo_fd_setup(&apn->tun.fd, apn->tun.tun->fd, BSC_FD_READ, ggsn_tun_fd_cb, apn, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+              osmo_fd_setup(&apn->tun.fd, apn->tun.tun->fd, OSMO_FD_READ, ggsn_tun_fd_cb, apn, 0);</span><br><span>            osmo_fd_register(&apn->tun.fd);</span><br><span> </span><br><span>           /* Set TUN library callback */</span><br><span>@@ -704,7 +704,7 @@</span><br><span> {</span><br><span>    struct apn_ctx *apn = fd->data;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-  OSMO_ASSERT(what & BSC_FD_READ);</span><br><span style="color: hsl(120, 100%, 40%);">+  OSMO_ASSERT(what & OSMO_FD_READ);</span><br><span> </span><br><span>    return tun_decaps(apn->tun.tun);</span><br><span> }</span><br><span>@@ -715,7 +715,7 @@</span><br><span>       struct ggsn_ctx *ggsn = fd->data;</span><br><span>         int rc;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-     OSMO_ASSERT(what & BSC_FD_READ);</span><br><span style="color: hsl(120, 100%, 40%);">+  OSMO_ASSERT(what & OSMO_FD_READ);</span><br><span> </span><br><span>    switch (fd->priv_nr) {</span><br><span>    case 0:</span><br><span>@@ -809,15 +809,15 @@</span><br><span>              ggsn->gsn->gsnu = ggsn->cfg.gtpu_addr.v4;</span><br><span> </span><br><span>       /* Register File Descriptors */</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_fd_setup(&ggsn->gtp_fd0, ggsn->gsn->fd0, BSC_FD_READ, ggsn_gtp_fd_cb, ggsn, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+     osmo_fd_setup(&ggsn->gtp_fd0, ggsn->gsn->fd0, OSMO_FD_READ, ggsn_gtp_fd_cb, ggsn, 0);</span><br><span>   rc = osmo_fd_register(&ggsn->gtp_fd0);</span><br><span>        OSMO_ASSERT(rc == 0);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-       osmo_fd_setup(&ggsn->gtp_fd1c, ggsn->gsn->fd1c, BSC_FD_READ, ggsn_gtp_fd_cb, ggsn, 1);</span><br><span style="color: hsl(120, 100%, 40%);">+   osmo_fd_setup(&ggsn->gtp_fd1c, ggsn->gsn->fd1c, OSMO_FD_READ, ggsn_gtp_fd_cb, ggsn, 1);</span><br><span>         rc = osmo_fd_register(&ggsn->gtp_fd1c);</span><br><span>       OSMO_ASSERT(rc == 0);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-       osmo_fd_setup(&ggsn->gtp_fd1u, ggsn->gsn->fd1u, BSC_FD_READ, ggsn_gtp_fd_cb, ggsn, 2);</span><br><span style="color: hsl(120, 100%, 40%);">+   osmo_fd_setup(&ggsn->gtp_fd1u, ggsn->gsn->fd1u, OSMO_FD_READ, ggsn_gtp_fd_cb, ggsn, 2);</span><br><span>         rc = osmo_fd_register(&ggsn->gtp_fd1u);</span><br><span>       OSMO_ASSERT(rc == 0);</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ggsn/+/20742">change 20742</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-ggsn/+/20742"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-ggsn </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ib660cbbeafd8f4077c693d53127ecd1c15455455 </div>
<div style="display:none"> Gerrit-Change-Number: 20742 </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-MessageType: newchange </div>