net/pkt: Remove legacy net_pkt_append functions
These were based on the former allocation scheme and are no longer used.
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 6ed49c0..efbfcee 100644
--- a/include/net/net_pkt.h
+++ b/include/net/net_pkt.h
@@ -1261,235 +1261,6 @@
bool net_pkt_compact(struct net_pkt *pkt);
/**
- * @brief Append data to fragment list of a packet
- *
- * @details Append data to last fragment. If there is not enough space in
- * last fragment then more data fragments will be added, unless there are
- * no free fragments and timeout occurs.
- *
- * @param pkt Network packet.
- * @param len Total length of input data
- * @param data Data to be added
- * @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 Length of data actually added. This may be less than input
- * length if other timeout than K_FOREVER was used, and there
- * were no free fragments in a pool to accommodate all data.
- */
-u16_t net_pkt_append(struct net_pkt *pkt, u16_t len, const u8_t *data,
- s32_t timeout);
-
-/**
- * @brief Append all data to fragment list of a packet (or fail)
- *
- * @details Append data to last fragment. If there is not enough space in
- * last fragment then more data fragments will be added. Return unsuccessful
- * status if there are no free fragments to accommodate all data and timeout
- * occurs.
- *
- * @param pkt Network packet.
- * @param len Total length of input data
- * @param data Data to be added
- * @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 True if all the data is placed at end of fragment list,
- * false otherwise (in which case packet may contain incomplete
- * input data).
- */
-static inline bool net_pkt_append_all(struct net_pkt *pkt, u16_t len,
- const u8_t *data, s32_t timeout)
-{
- return net_pkt_append(pkt, len, data, timeout) == len;
-}
-
-/**
- * @brief Append u8_t data to last fragment in fragment list of a packet
- *
- * @details Append data to last fragment. If there is not enough space in last
- * fragment then new data fragment will be created and will be added to
- * fragment list. Caller has to take care of endianness if needed.
- *
- * @param pkt Network packet.
- * @param data Data to be added
- *
- * @return True if all the data is placed at end of fragment list,
- * False otherwise (In-case of false pkt might contain input
- * data in the process of placing into fragments).
- */
-static inline bool net_pkt_append_u8(struct net_pkt *pkt, u8_t data)
-{
- return net_pkt_append_all(pkt, 1, &data, K_FOREVER);
-}
-
-/**
- * @brief Append u16_t data to last fragment in fragment list of a packet
- *
- * @details Append data to last fragment. If there is not enough space in last
- * fragment then new data fragment will be created and will be added to
- * fragment list. Caller has to take care of endianness if needed.
- *
- * @param pkt Network packet.
- * @param data Data to be added
- *
- * @return True if all the data is placed at end of fragment list,
- * False otherwise (In-case of false pkt might contain input data
- * in the process of placing into fragments).
- */
-static inline bool net_pkt_append_be16(struct net_pkt *pkt, u16_t data)
-{
- u16_t value = sys_cpu_to_be16(data);
-
- return net_pkt_append_all(pkt, sizeof(u16_t), (u8_t *)&value,
- K_FOREVER);
-}
-
-/**
- * @brief Append u32_t data to last fragment in fragment list of a packet
- *
- * @details Append data to last fragment. If there is not enough space in last
- * fragment then new data fragment will be created and will be added to
- * fragment list. Caller has to take care of endianness if needed.
- *
- * @param pkt Network packet.
- * @param data Data to be added
- *
- * @return True if all the data is placed at end of fragment list,
- * False otherwise (In-case of false pkt might contain input data
- * in the process of placing into fragments).
- */
-static inline bool net_pkt_append_be32(struct net_pkt *pkt, u32_t data)
-{
- u32_t value = sys_cpu_to_be32(data);
-
- return net_pkt_append_all(pkt, sizeof(u32_t), (u8_t *)&value,
- K_FOREVER);
-}
-
-/**
- * @brief Append u32_t data to last fragment in fragment list
- *
- * @details Append data to last fragment. If there is not enough space in last
- * fragment then new data fragment will be created and will be added to
- * fragment list. Convert data to LE.
- *
- * @param pkt Network packet fragment list.
- * @param data Data to be added
- *
- * @return True if all the data is placed at end of fragment list,
- * False otherwise (In-case of false pkt might contain input data
- * in the process of placing into fragments).
- */
-static inline bool net_pkt_append_le32(struct net_pkt *pkt, u32_t data)
-{
- u32_t value = sys_cpu_to_le32(data);
-
- return net_pkt_append_all(pkt, sizeof(u32_t), (u8_t *)&value,
- K_FOREVER);
-}
-
-/**
- * @brief Append u8_t data to last fragment in fragment list of a packet
- *
- * @details Append data to last fragment. If there is not enough space in last
- * fragment then new data fragment will be created and will be added to
- * fragment list. Caller has to take care of endianness if needed.
- *
- * @param pkt Network packet.
- * @param data Data to be added
- * @param timeout Timeout for buffer allocations
- *
- * @return True if all the data is placed at end of fragment list,
- * False otherwise (In-case of false pkt might contain input
- * data in the process of placing into fragments).
- */
-static inline bool net_pkt_append_u8_timeout(struct net_pkt *pkt, u8_t data,
- s32_t timeout)
-{
- return net_pkt_append_all(pkt, 1, &data, timeout);
-}
-
-/**
- * @brief Append u16_t data to last fragment in fragment list of a packet
- *
- * @details Append data to last fragment. If there is not enough space in last
- * fragment then new data fragment will be created and will be added to
- * fragment list. Caller has to take care of endianness if needed.
- *
- * @param pkt Network packet.
- * @param data Data to be added
- * @param timeout Timeout for buffer allocations
- *
- * @return True if all the data is placed at end of fragment list,
- * False otherwise (In-case of false pkt might contain input data
- * in the process of placing into fragments).
- */
-static inline bool net_pkt_append_be16_timeout(struct net_pkt *pkt,
- u16_t data,
- s32_t timeout)
-{
- u16_t value = sys_cpu_to_be16(data);
-
- return net_pkt_append_all(pkt, sizeof(u16_t), (u8_t *)&value,
- timeout);
-}
-
-/**
- * @brief Append u32_t data to last fragment in fragment list of a packet
- *
- * @details Append data to last fragment. If there is not enough space in last
- * fragment then new data fragment will be created and will be added to
- * fragment list. Caller has to take care of endianness if needed.
- *
- * @param pkt Network packet.
- * @param data Data to be added
- * @param timeout Timeout for buffer allocations
- *
- * @return True if all the data is placed at end of fragment list,
- * False otherwise (In-case of false pkt might contain input data
- * in the process of placing into fragments).
- */
-static inline bool net_pkt_append_be32_timeout(struct net_pkt *pkt,
- u32_t data,
- s32_t timeout)
-{
- u32_t value = sys_cpu_to_be32(data);
-
- return net_pkt_append_all(pkt, sizeof(u32_t), (u8_t *)&value,
- timeout);
-}
-
-/**
- * @brief Append u32_t data to last fragment in fragment list
- *
- * @details Append data to last fragment. If there is not enough space in last
- * fragment then new data fragment will be created and will be added to
- * fragment list. Convert data to LE.
- *
- * @param pkt Network packet fragment list.
- * @param data Data to be added
- * @param timeout Timeout for buffer allocations
- *
- * @return True if all the data is placed at end of fragment list,
- * False otherwise (In-case of false pkt might contain input data
- * in the process of placing into fragments).
- */
-static inline bool net_pkt_append_le32_timeout(struct net_pkt *pkt,
- u32_t data,
- s32_t timeout)
-{
- u32_t value = sys_cpu_to_le32(data);
-
- return net_pkt_append_all(pkt, sizeof(u32_t), (u8_t *)&value,
- timeout);
-}
-
-/**
* @brief Get information about predefined RX, TX and DATA pools.
*
* @param rx Pointer to RX pool is returned.
diff --git a/subsys/net/ip/net_pkt.c b/subsys/net/ip/net_pkt.c
index 30d1102..64be8e1 100644
--- a/subsys/net/ip/net_pkt.c
+++ b/subsys/net/ip/net_pkt.c
@@ -1051,65 +1051,6 @@
return true;
}
-static inline struct net_buf *net_pkt_append_allocator(s32_t timeout,
- void *user_data)
-{
- return net_pkt_get_frag((struct net_pkt *)user_data, timeout);
-}
-
-u16_t net_pkt_append(struct net_pkt *pkt, u16_t len, const u8_t *data,
- s32_t timeout)
-{
- struct net_buf *frag;
- struct net_context *ctx = NULL;
- u16_t max_len, appended;
-
- if (!pkt || !data || !len) {
- return 0;
- }
-
- if (!pkt->frags) {
- frag = net_pkt_get_frag(pkt, timeout);
- if (!frag) {
- return 0;
- }
-
- net_pkt_frag_add(pkt, frag);
- }
-
- if (pkt->slab != &rx_pkts) {
- ctx = net_pkt_context(pkt);
- }
-
- if (ctx) {
- /* Make sure we don't send more data in one packet than
- * protocol or MTU allows when there is a context for the
- * packet.
- */
- max_len = pkt->data_len;
-
-#if defined(CONFIG_NET_TCP)
- if (ctx->tcp && (ctx->tcp->send_mss < max_len)) {
- max_len = ctx->tcp->send_mss;
- }
-#endif
-
- if (len > max_len) {
- len = max_len;
- }
- }
-
- appended = net_buf_append_bytes(net_buf_frag_last(pkt->frags),
- len, data, timeout,
- net_pkt_append_allocator, pkt);
-
- if (ctx) {
- pkt->data_len -= appended;
- }
-
- return appended;
-}
-
void net_pkt_get_info(struct k_mem_slab **rx,
struct k_mem_slab **tx,
struct net_buf_pool **rx_data,
