<p>lynxis lazus has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/20268">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ns2: ns2_recv_vc: remove unsued parameter nsi<br><br>Change-Id: I0dbc079e83d37de01a4260442363ed5fdcd51d28<br>---<br>M src/gb/gprs_ns2.c<br>M src/gb/gprs_ns2_frgre.c<br>M src/gb/gprs_ns2_internal.h<br>M src/gb/gprs_ns2_udp.c<br>4 files changed, 8 insertions(+), 11 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/68/20268/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/gb/gprs_ns2.c b/src/gb/gprs_ns2.c</span><br><span>index 57a08d1..45ae002 100644</span><br><span>--- a/src/gb/gprs_ns2.c</span><br><span>+++ b/src/gb/gprs_ns2.c</span><br><span>@@ -844,12 +844,10 @@</span><br><span> </span><br><span> </span><br><span> /*! Bottom-side entry-point for received NS PDU from the driver/bind</span><br><span style="color: hsl(0, 100%, 40%);">- * \param[in] nsi NS instance</span><br><span>  * \param[in] nsvc NS-VC for which the message was received</span><br><span>  * \param msg the received message. Ownership is trasnferred, caller must not free it!</span><br><span>  * \return 0 on success; negative on error */</span><br><span style="color: hsl(0, 100%, 40%);">-int ns2_recv_vc(struct gprs_ns2_inst *nsi,</span><br><span style="color: hsl(0, 100%, 40%);">-            struct gprs_ns2_vc *nsvc,</span><br><span style="color: hsl(120, 100%, 40%);">+int ns2_recv_vc(struct gprs_ns2_vc *nsvc,</span><br><span>                 struct msgb *msg)</span><br><span> {</span><br><span>       struct gprs_ns_hdr *nsh = (struct gprs_ns_hdr *) msg->l2h;</span><br><span>diff --git a/src/gb/gprs_ns2_frgre.c b/src/gb/gprs_ns2_frgre.c</span><br><span>index 715c41a..0903e46 100644</span><br><span>--- a/src/gb/gprs_ns2_frgre.c</span><br><span>+++ b/src/gb/gprs_ns2_frgre.c</span><br><span>@@ -446,7 +446,7 @@</span><br><span>                 rc = ns2_create_vc(bind, msg, "newconnection", &reject, &nsvc);</span><br><span>            switch (rc) {</span><br><span>                case GPRS_NS2_CS_FOUND:</span><br><span style="color: hsl(0, 100%, 40%);">-                 rc = ns2_recv_vc(bind->nsi, nsvc, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+                    rc = ns2_recv_vc(nsvc, msg);</span><br><span>                         break;</span><br><span>               case GPRS_NS2_CS_ERROR:</span><br><span>              case GPRS_NS2_CS_SKIPPED:</span><br><span>@@ -459,12 +459,12 @@</span><br><span>            case GPRS_NS2_CS_CREATED:</span><br><span>                    frgre_alloc_vc(bind, nsvc, &saddr, dlci);</span><br><span>                        gprs_ns2_vc_fsm_start(nsvc);</span><br><span style="color: hsl(0, 100%, 40%);">-                    rc = ns2_recv_vc(bind->nsi, nsvc, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+                    rc = ns2_recv_vc(nsvc, msg);</span><br><span>                         break;</span><br><span>               }</span><br><span>    } else {</span><br><span>             /* VC found */</span><br><span style="color: hsl(0, 100%, 40%);">-          rc = ns2_recv_vc(bind->nsi, nsvc, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+            rc = ns2_recv_vc(nsvc, msg);</span><br><span>         }</span><br><span> out:</span><br><span>    msgb_free(msg);</span><br><span>diff --git a/src/gb/gprs_ns2_internal.h b/src/gb/gprs_ns2_internal.h</span><br><span>index 708eb59..15b0bc5 100644</span><br><span>--- a/src/gb/gprs_ns2_internal.h</span><br><span>+++ b/src/gb/gprs_ns2_internal.h</span><br><span>@@ -203,8 +203,7 @@</span><br><span>                          struct msgb **reject,</span><br><span>                                struct gprs_ns2_vc **success);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int ns2_recv_vc(struct gprs_ns2_inst *nsi,</span><br><span style="color: hsl(0, 100%, 40%);">-             struct gprs_ns2_vc *nsvc,</span><br><span style="color: hsl(120, 100%, 40%);">+int ns2_recv_vc(struct gprs_ns2_vc *nsvc,</span><br><span>                 struct msgb *msg);</span><br><span> </span><br><span> struct gprs_ns2_vc *ns2_vc_alloc(struct gprs_ns2_vc_bind *bind,</span><br><span>diff --git a/src/gb/gprs_ns2_udp.c b/src/gb/gprs_ns2_udp.c</span><br><span>index 40923b2..db83413 100644</span><br><span>--- a/src/gb/gprs_ns2_udp.c</span><br><span>+++ b/src/gb/gprs_ns2_udp.c</span><br><span>@@ -195,7 +195,7 @@</span><br><span>             rc = ns2_create_vc(bind, msg, "newconnection", &reject, &nsvc);</span><br><span>            switch (rc) {</span><br><span>                case GPRS_NS2_CS_FOUND:</span><br><span style="color: hsl(0, 100%, 40%);">-                 rc = ns2_recv_vc(bind->nsi, nsvc, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+                    rc = ns2_recv_vc(nsvc, msg);</span><br><span>                         break;</span><br><span>               case GPRS_NS2_CS_ERROR:</span><br><span>              case GPRS_NS2_CS_SKIPPED:</span><br><span>@@ -208,12 +208,12 @@</span><br><span>            case GPRS_NS2_CS_CREATED:</span><br><span>                    ns2_driver_alloc_vc(bind, nsvc, &saddr);</span><br><span>                         gprs_ns2_vc_fsm_start(nsvc);</span><br><span style="color: hsl(0, 100%, 40%);">-                    rc = ns2_recv_vc(bind->nsi, nsvc, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+                    rc = ns2_recv_vc(nsvc, msg);</span><br><span>                         break;</span><br><span>               }</span><br><span>    } else {</span><br><span>             /* VC found */</span><br><span style="color: hsl(0, 100%, 40%);">-          rc = ns2_recv_vc(bind->nsi, nsvc, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+            rc = ns2_recv_vc(nsvc, msg);</span><br><span>         }</span><br><span> </span><br><span>        msgb_free(msg);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/20268">change 20268</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/libosmocore/+/20268"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: libosmocore </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I0dbc079e83d37de01a4260442363ed5fdcd51d28 </div>
<div style="display:none"> Gerrit-Change-Number: 20268 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>