From ea671acadb02572bfeb1cd4cbf952e34f8a14da9 Mon Sep 17 00:00:00 2001 From: Tomasz Bursztyka Date: Tue, 5 Feb 2019 10:03:57 +0100 Subject: [PATCH] net/pkt: Remove useless net_pkt_set_appdata_values() function UDP/TCP are setting the appdata attributes by themselves now. Signed-off-by: Tomasz Bursztyka --- subsys/net/ip/net_context.c | 3 --- subsys/net/ip/net_pkt.c | 39 ------------------------------------- subsys/net/ip/net_private.h | 3 --- 3 files changed, 45 deletions(-) diff --git a/subsys/net/ip/net_context.c b/subsys/net/ip/net_context.c index 8f9fcd288f5..28288df8d77 100644 --- a/subsys/net/ip/net_context.c +++ b/subsys/net/ip/net_context.c @@ -1808,9 +1808,6 @@ enum net_verdict net_context_packet_received(struct net_conn *conn, if (net_context_get_ip_proto(context) == IPPROTO_TCP) { net_stats_update_tcp_recv(net_pkt_iface(pkt), net_pkt_appdatalen(pkt)); - } else if (net_context_get_ip_proto(context) == IPPROTO_UDP) { - /* TCP packets get appdata earlier in tcp_established(). */ - net_pkt_set_appdata_values(pkt, IPPROTO_UDP); } context->recv_cb(context, pkt, ip_hdr, proto_hdr, 0, user_data); diff --git a/subsys/net/ip/net_pkt.c b/subsys/net/ip/net_pkt.c index 4d8d5443216..f1adc712c76 100644 --- a/subsys/net/ip/net_pkt.c +++ b/subsys/net/ip/net_pkt.c @@ -1936,45 +1936,6 @@ struct net_buf *net_frag_get_pos(struct net_pkt *pkt, return frag; } -void net_pkt_set_appdata_values(struct net_pkt *pkt, - enum net_ip_protocol proto) -{ - size_t total_len = net_pkt_get_len(pkt); - u16_t proto_len = 0U; - struct net_buf *frag; - u16_t offset; - - switch (proto) { - case IPPROTO_UDP: -#if defined(CONFIG_NET_UDP) - proto_len = sizeof(struct net_udp_hdr); -#endif /* CONFIG_NET_UDP */ - break; - - case IPPROTO_TCP: - proto_len = tcp_hdr_len(pkt); - break; - - default: - return; - } - - frag = net_frag_get_pos(pkt, net_pkt_ip_hdr_len(pkt) + - net_pkt_ipv6_ext_len(pkt) + - proto_len, - &offset); - if (frag) { - net_pkt_set_appdata(pkt, frag->data + offset); - } - - net_pkt_set_appdatalen(pkt, total_len - net_pkt_ip_hdr_len(pkt) - - net_pkt_ipv6_ext_len(pkt) - proto_len); - - NET_ASSERT_INFO(net_pkt_appdatalen(pkt) < total_len, - "Wrong appdatalen %u, total %zu", - net_pkt_appdatalen(pkt), total_len); -} - struct net_pkt *net_pkt_clone(struct net_pkt *pkt, s32_t timeout) { struct net_pkt *clone; diff --git a/subsys/net/ip/net_private.h b/subsys/net/ip/net_private.h index 4f0de73a39c..f9c7b5ede2c 100644 --- a/subsys/net/ip/net_private.h +++ b/subsys/net/ip/net_private.h @@ -87,9 +87,6 @@ extern char *net_sprint_ll_addr_buf(const u8_t *ll, u8_t ll_len, char *buf, int buflen); extern u16_t net_calc_chksum(struct net_pkt *pkt, u8_t proto); -void net_pkt_set_appdata_values(struct net_pkt *pkt, - enum net_ip_protocol proto); - enum net_verdict net_context_packet_received(struct net_conn *conn, struct net_pkt *pkt, union net_ip_header *ip_hdr,