net/pkt: Remove useless legacy net_pkt_split function
Now that the stack does not use this function, it can be removed
safely.
Signed-off-by: Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com>
diff --git a/include/net/net_pkt.h b/include/net/net_pkt.h
index b85adf8..d2a7587 100644
--- a/include/net/net_pkt.h
+++ b/include/net/net_pkt.h
@@ -1880,28 +1880,6 @@
}
/**
- * @brief Split a fragment into two parts at arbitrary offset.
- *
- * @details This will split packet into two parts. Original packet will be
- * modified. Offset is relative position with input fragment. Input fragment
- * contains first part of the split. Rest of the fragment chain is in "rest"
- * parameter provided by caller.
- *
- * @param pkt Network packet
- * @param frag Original network buffer fragment which is to be split.
- * @param offset Offset relative to input fragment.
- * @param rest Rest of the fragment chain after split.
- * @param timeout Affects the action taken should the net buf pool be empty.
- * If K_NO_WAIT, then return immediately. If K_FOREVER, then wait as long as
- * necessary. Otherwise, wait up to the specified number of milliseconds before
- * timing out.
- *
- * @return 0 on success, <0 otherwise.
- */
-int net_pkt_split(struct net_pkt *pkt, struct net_buf *frag, u16_t offset,
- struct net_buf **rest, s32_t timeout);
-
-/**
* @brief Return the fragment and offset within it according to network
* packet offset.
*
diff --git a/subsys/net/ip/net_pkt.c b/subsys/net/ip/net_pkt.c
index 13b7209..501a511 100644
--- a/subsys/net/ip/net_pkt.c
+++ b/subsys/net/ip/net_pkt.c
@@ -1650,54 +1650,6 @@
return insert_data(pkt, frag, temp, offset, len, data, timeout);
}
-int net_pkt_split(struct net_pkt *pkt, struct net_buf *frag, u16_t offset,
- struct net_buf **rest, s32_t timeout)
-{
- struct net_buf *prev;
-
- if (!pkt || !frag || !offset || !rest) {
- return -EINVAL;
- }
-
- prev = frag;
- *rest = NULL;
-
- while (frag) {
- if (offset < frag->len) {
- break;
- }
-
- offset -= frag->len;
- prev = frag;
- frag = frag->frags;
- }
-
- if (!frag && offset) {
- return -EINVAL;
- }
-
- if (!frag && !offset) {
- *rest = frag;
- prev->frags = NULL;
-
- return 0;
- }
-
- *rest = net_pkt_get_frag(pkt, timeout);
- if (!*rest) {
- return -ENOMEM;
- }
-
- memcpy(net_buf_add(*rest, frag->len - offset),
- frag->data + offset, frag->len - offset);
- frag->len = offset;
-
- (*rest)->frags = frag->frags;
- frag->frags = NULL;
-
- return 0;
-}
-
void net_pkt_get_info(struct k_mem_slab **rx,
struct k_mem_slab **tx,
struct net_buf_pool **rx_data,
diff --git a/tests/net/net_pkt/src/main.c b/tests/net/net_pkt/src/main.c
index 911ab2a..bd7f3ae 100644
--- a/tests/net/net_pkt/src/main.c
+++ b/tests/net/net_pkt/src/main.c
@@ -861,107 +861,6 @@
DBG("test_fragment_compact passed\n");
}
-static const char frag_data[512] = { 42 };
-static void test_fragment_split(void)
-{
- struct net_pkt *pkt;
- struct net_buf *rest;
- int ret;
-
- pkt = net_pkt_get_reserve_rx(K_FOREVER);
-
- ret = net_pkt_append(pkt, 50, (u8_t *) frag_data, K_FOREVER);
-
- zassert_false(!ret, "Failed to append data");
-
- ret = net_pkt_split(pkt, pkt->frags, 10, &rest, K_FOREVER);
-
- zassert_false(ret, "Failed to split net_pkt at offset 10");
- zassert_false(!pkt->frags, "Failed to split net_pkt at offset 10");
- zassert_false(!rest, "Failed to split net_pkt at offset 10");
-
- net_pkt_unref(pkt);
- net_buf_unref(rest);
-
- pkt = net_pkt_get_reserve_rx(K_FOREVER);
-
- ret = net_pkt_append(pkt, 100, (u8_t *) frag_data, K_FOREVER);
-
- zassert_false(!ret, "Failed to append data");
-
- ret = net_pkt_split(pkt, pkt->frags, 100, &rest, K_FOREVER);
-
- zassert_false(ret, "Failed to split net_pkt at offset 100");
- zassert_false(!pkt->frags,
- "Failed to split net_pkt at offset 100");
- zassert_false(rest, "Failed to split net_pkt at offset 100");
-
- net_pkt_unref(pkt);
-
- pkt = net_pkt_get_reserve_rx(K_FOREVER);
-
- ret = net_pkt_append(pkt, 100, (u8_t *) frag_data, K_FOREVER);
-
- zassert_false(!ret, "Failed to append data");
-
- ret = net_pkt_split(pkt, pkt->frags, 50, &rest, K_FOREVER);
-
- zassert_false(ret, "Failed to split net_pkt at offset 50");
- zassert_false(!pkt->frags,
- "Failed to split net_pkt at offset 50");
- zassert_false(!rest, "Failed to split net_pkt at offset 50");
-
- zassert_false(net_pkt_get_len(pkt) != 50,
- "Failed to split net_pkt at offset 50");
- zassert_false(net_buf_frags_len(rest) != 50,
- "Failed to split net_pkt at offset 50");
-
- net_pkt_unref(pkt);
- net_buf_unref(rest);
-
- pkt = net_pkt_get_reserve_rx(K_FOREVER);
-
- ret = net_pkt_append(pkt, 350, (u8_t *) frag_data, K_FOREVER);
-
- zassert_false(!ret, "Failed to append data");
-
- ret = net_pkt_split(pkt, pkt->frags, 150, &rest, K_FOREVER);
-
- zassert_false(ret, "Failed to split net_pkt at offset 150");
- zassert_false(!pkt->frags,
- "Failed to split net_pkt at offset 150");
- zassert_false(!rest, "Failed to split net_pkt at offset 150");
-
- zassert_false(net_pkt_get_len(pkt) != 150,
- "Failed to split net_pkt at offset 150");
- zassert_false(net_buf_frags_len(rest) != 200,
- "Failed to split net_pkt at offset 150");
-
- net_pkt_unref(pkt);
- net_buf_unref(rest);
-
- pkt = net_pkt_get_reserve_rx(K_FOREVER);
-
- ret = net_pkt_append(pkt, 512, (u8_t *) frag_data, K_FOREVER);
-
- zassert_false(!ret, "Failed to append data");
-
- ret = net_pkt_split(pkt, pkt->frags, 500, &rest, K_FOREVER);
-
- zassert_false(ret, "Failed to split net_pkt at offset 500");
- zassert_false(!pkt->frags,
- "Failed to split net_pkt at offset 500");
- zassert_false(!rest, "Failed to split net_pkt at offset 500");
-
- zassert_false(net_pkt_get_len(pkt) != 500,
- "Failed to split net_pkt at offset 500");
- zassert_false(net_buf_frags_len(rest) != 12,
- "Failed to split net_pkt at offset 500");
-
- net_pkt_unref(pkt);
- net_buf_unref(rest);
-}
-
static void test_net_pkt_append_memset(void)
{
struct net_pkt *pkt;
@@ -1032,7 +931,6 @@
ztest_unit_test(test_pkt_read_append),
ztest_unit_test(test_pkt_read_write_insert),
ztest_unit_test(test_fragment_compact),
- ztest_unit_test(test_fragment_split),
ztest_unit_test(test_net_pkt_append_memset),
ztest_unit_test(test_net_pkt_frag_linearize)
);
