From 347e17543fb1bda497406e94833af9babe2a58ba Mon Sep 17 00:00:00 2001 From: Tomasz Bursztyka Date: Fri, 8 Feb 2019 09:23:24 +0100 Subject: [PATCH] net/pkt: Remove useless legacy net_pkt_clone() function Now that the stack uses the new API from net_pkt for cloning, no need to keep the legacy one around. Signed-off-by: Tomasz Bursztyka --- include/net/net_pkt.h | 10 ------- subsys/net/ip/net_pkt.c | 63 ----------------------------------------- 2 files changed, 73 deletions(-) diff --git a/include/net/net_pkt.h b/include/net/net_pkt.h index 6044730043e..58c525266fc 100644 --- a/include/net/net_pkt.h +++ b/include/net/net_pkt.h @@ -1983,16 +1983,6 @@ struct net_buf *net_frag_get_pos(struct net_pkt *pkt, u16_t offset, u16_t *pos); -/** - * @brief Clone pkt and its fragment chain. - * - * @param pkt Original pkt to be cloned - * @param timeout Timeout to wait for free net_buf - * - * @return NULL if error, clone fragment chain otherwise. - */ -struct net_pkt *net_pkt_clone(struct net_pkt *pkt, s32_t timeout); - /** * @brief Get information about predefined RX, TX and DATA pools. * diff --git a/subsys/net/ip/net_pkt.c b/subsys/net/ip/net_pkt.c index 3b4bde1a657..cc349fd1c7d 100644 --- a/subsys/net/ip/net_pkt.c +++ b/subsys/net/ip/net_pkt.c @@ -1936,69 +1936,6 @@ struct net_buf *net_frag_get_pos(struct net_pkt *pkt, return frag; } -struct net_pkt *net_pkt_clone(struct net_pkt *pkt, s32_t timeout) -{ - struct net_pkt *clone; - - if (!pkt) { - return NULL; - } - - clone = net_pkt_get_reserve(pkt->slab, timeout); - if (!clone) { - return NULL; - } - - clone->frags = NULL; - - if (pkt->frags) { - clone->frags = net_pkt_copy_all(pkt, 0, timeout); - if (!clone->frags) { - net_pkt_unref(clone); - return NULL; - } - } - - clone->context = pkt->context; - clone->token = pkt->token; - clone->iface = pkt->iface; - - if (clone->frags) { - /* The link header pointers are only usable if there is - * a fragment that we copied because those pointers point - * to start of the fragment which we do not have right now. - */ - memcpy(&clone->lladdr_src, &pkt->lladdr_src, - sizeof(clone->lladdr_src)); - memcpy(&clone->lladdr_dst, &pkt->lladdr_dst, - sizeof(clone->lladdr_dst)); - } - - net_pkt_set_ip_hdr_len(clone, net_pkt_ip_hdr_len(pkt)); - net_pkt_set_vlan_tag(clone, net_pkt_vlan_tag(pkt)); - net_pkt_set_appdata(clone, NULL); - net_pkt_set_appdatalen(clone, net_pkt_appdatalen(pkt)); - net_pkt_set_transport_proto(clone, net_pkt_transport_proto(pkt)); - - net_pkt_set_timestamp(clone, net_pkt_timestamp(pkt)); - net_pkt_set_priority(clone, net_pkt_priority(pkt)); - net_pkt_set_orig_iface(clone, net_pkt_orig_iface(pkt)); - - net_pkt_set_family(clone, net_pkt_family(pkt)); - -#if defined(CONFIG_NET_IPV6) - clone->ipv6_hop_limit = pkt->ipv6_hop_limit; - clone->ipv6_ext_len = pkt->ipv6_ext_len; - clone->ipv6_ext_opt_len = pkt->ipv6_ext_opt_len; - clone->ipv6_prev_hdr_start = pkt->ipv6_prev_hdr_start; - net_pkt_set_ipv6_next_hdr(clone, net_pkt_ipv6_next_hdr(pkt)); -#endif - - NET_DBG("Cloned %p to %p", pkt, clone); - - return clone; -} - /* New allocator and API starts here */ #if defined(CONFIG_NET_BUF_FIXED_DATA_SIZE)