<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/21877">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;">gprs_ns2: rework frame relay load distribution function<br><br>For frame relay the traffic will be even distributed across<br>all NS-VCs. Do not differentiate between signalling and<br>data traffic.<br><br>Change-Id: I6c060941db335a7a6a555ac8d1b9269fa8fb2023<br>---<br>M src/gb/gprs_ns2.c<br>M src/gb/gprs_ns2_internal.h<br>2 files changed, 18 insertions(+), 23 deletions(-)<br><br></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 5603fce..1098f22 100644</span><br><span>--- a/src/gb/gprs_ns2.c</span><br><span>+++ b/src/gb/gprs_ns2.c</span><br><span>@@ -350,15 +350,12 @@</span><br><span> uint32_t load_selector)</span><br><span> {</span><br><span> struct gprs_ns2_vc *tmp;</span><br><span style="color: hsl(0, 100%, 40%);">- uint32_t mod = (bvci + load_selector) % nse->nsvc_data_count;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t mod = (bvci + load_selector) % nse->nsvc_count;</span><br><span> uint32_t i = 0;</span><br><span> </span><br><span> llist_for_each_entry(tmp, &nse->nsvc, list) {</span><br><span> if (!gprs_ns2_vc_is_unblocked(tmp))</span><br><span> continue;</span><br><span style="color: hsl(0, 100%, 40%);">- if (tmp->data_weight == 0)</span><br><span style="color: hsl(0, 100%, 40%);">- continue;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> if (i == mod)</span><br><span> return tmp;</span><br><span> i++;</span><br><span>@@ -393,22 +390,20 @@</span><br><span> {</span><br><span> struct gprs_ns2_vc *nsvc = NULL;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (bvci == 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- /* signalling */</span><br><span style="color: hsl(0, 100%, 40%);">- nsvc = ns2_load_sharing_signal(nse);</span><br><span style="color: hsl(0, 100%, 40%);">- } else {</span><br><span style="color: hsl(0, 100%, 40%);">- /* data with load sharing parameter */</span><br><span style="color: hsl(0, 100%, 40%);">- if (llist_empty(&nse->nsvc))</span><br><span style="color: hsl(0, 100%, 40%);">- return NULL;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- switch (nse->ll) {</span><br><span style="color: hsl(0, 100%, 40%);">- case GPRS_NS2_LL_FR:</span><br><span style="color: hsl(0, 100%, 40%);">- nsvc = ns2_load_sharing_modulor(nse, bvci, link_selector);</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- default:</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (nse->ll) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case GPRS_NS2_LL_FR:</span><br><span style="color: hsl(120, 100%, 40%);">+ nsvc = ns2_load_sharing_modulor(nse, bvci, link_selector);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case GPRS_NS2_LL_UDP:</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bvci == 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* signalling */</span><br><span style="color: hsl(120, 100%, 40%);">+ nsvc = ns2_load_sharing_signal(nse);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* data with load sharing parameter */</span><br><span> nsvc = ns2_load_sharing_first(nse);</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span> }</span><br><span> </span><br><span> return nsvc;</span><br><span>@@ -1087,13 +1082,13 @@</span><br><span> void ns2_nse_data_sum(struct gprs_ns2_nse *nse)</span><br><span> {</span><br><span> struct gprs_ns2_vc *nsvc;</span><br><span style="color: hsl(0, 100%, 40%);">- nse->nsvc_data_count = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ nse->nsvc_count = 0;</span><br><span> </span><br><span> llist_for_each_entry(nsvc, &nse->nsvc, list) {</span><br><span> if (!gprs_ns2_vc_is_unblocked(nsvc))</span><br><span> continue;</span><br><span style="color: hsl(0, 100%, 40%);">- if (nsvc->data_weight > 0)</span><br><span style="color: hsl(0, 100%, 40%);">- nse->nsvc_data_count++;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ nse->nsvc_count++;</span><br><span> }</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/gb/gprs_ns2_internal.h b/src/gb/gprs_ns2_internal.h</span><br><span>index 5cb1630..4c0cdd0 100644</span><br><span>--- a/src/gb/gprs_ns2_internal.h</span><br><span>+++ b/src/gb/gprs_ns2_internal.h</span><br><span>@@ -116,8 +116,8 @@</span><br><span> /*! llist head to hold all nsvc */</span><br><span> struct llist_head nsvc;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /*! count all active NSVCs with data capabilities */</span><br><span style="color: hsl(0, 100%, 40%);">- int nsvc_data_count;</span><br><span style="color: hsl(120, 100%, 40%);">+ /*! count all active NSVCs */</span><br><span style="color: hsl(120, 100%, 40%);">+ int nsvc_count;</span><br><span> </span><br><span> /*! true if this NSE was created by VTY or pcu socket) */</span><br><span> bool persistent;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/21877">change 21877</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/+/21877"/><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: I6c060941db335a7a6a555ac8d1b9269fa8fb2023 </div>
<div style="display:none"> Gerrit-Change-Number: 21877 </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-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>