pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/libosmo-netif/+/30160 )
Change subject: osmux: Fix naming of functions operating on osmux circuits
......................................................................
osmux: Fix naming of functions operating on osmux circuits
Let's put the object and update the naming of the functions accordingly.
Change-Id: Ieaac449fe04831e47ff932c234c18994f157df88
---
M src/osmux_input.c
1 file changed, 6 insertions(+), 6 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/60/30160/1
diff --git a/src/osmux_input.c b/src/osmux_input.c
index c1cd2c6..aa48049 100644
--- a/src/osmux_input.c
+++ b/src/osmux_input.c
@@ -81,7 +81,7 @@
};
/* returns: 1 if batch is full, 0 if batch still not full, negative on error.
*/
-static int osmux_batch_enqueue(struct msgb *msg, struct osmux_circuit *circuit,
+static int osmux_circuit_enqueue(struct osmux_circuit *circuit, struct msgb
*msg,
uint8_t batch_factor)
{
/* Validate amount of messages per batch. The counter field of the
@@ -104,7 +104,7 @@
return 0;
}
-static void osmux_batch_dequeue(struct msgb *msg, struct osmux_circuit
*circuit)
+static void osmux_circuit_dequeue(struct osmux_circuit *circuit, struct msgb
*msg)
{
llist_del(&msg->list);
circuit->nmsgs--;
@@ -114,7 +114,7 @@
{
struct msgb *cur, *tmp;
llist_for_each_entry_safe(cur, tmp, &circuit->msg_list, list) {
- osmux_batch_dequeue(cur, circuit);
+ osmux_circuit_dequeue(circuit, cur);
msgb_free(cur);
batch->nmsgs--;
}
@@ -257,7 +257,7 @@
}
osmux_batch_put(batch, &state);
- osmux_batch_dequeue(cur, circuit);
+ osmux_circuit_dequeue(circuit, cur);
prev_amr_ft = state.amrh->ft;
ctr++;
msgb_free(cur);
@@ -398,7 +398,7 @@
DELTA_RTP_TIMESTAMP);
/* No more room in this batch, skip padding with more clones */
- rc = osmux_batch_enqueue(clone, circuit, batch_factor);
+ rc = osmux_circuit_enqueue(circuit, clone, batch_factor);
if (rc != 0) {
msgb_free(clone);
return rc;
@@ -502,7 +502,7 @@
return rc;
/* This batch is full, force batch delivery */
- rc = osmux_batch_enqueue(msg, circuit, batch_factor);
+ rc = osmux_circuit_enqueue(circuit, msg, batch_factor);
if (rc != 0)
return rc;
--
To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/30160
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-netif
Gerrit-Branch: master
Gerrit-Change-Id: Ieaac449fe04831e47ff932c234c18994f157df88
Gerrit-Change-Number: 30160
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <[email protected]>
Gerrit-MessageType: newchange
