From f41b5b3bd09fcbd924bb405cdc5313fdf21c495a Mon Sep 17 00:00:00 2001 From: Jarno Rajahalme Date: Wed, 19 Mar 2014 16:13:32 -0700 Subject: [PATCH] lib/packets: Remove packet_get_tcp_flags(). This function has no more users, so remove it. Signed-off-by: Jarno Rajahalme Signed-off-by: Ben Pfaff --- lib/packets.c | 18 +----------------- lib/packets.h | 1 - 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/lib/packets.c b/lib/packets.c index 0c023fc21..65ba3f685 100644 --- a/lib/packets.c +++ b/lib/packets.c @@ -895,22 +895,6 @@ packet_set_sctp_port(struct ofpbuf *packet, ovs_be16 src, ovs_be16 dst) sh->sctp_csum = old_csum ^ old_correct_csum ^ new_csum; } -/* If 'packet' is a TCP packet, returns the TCP flags. Otherwise, returns 0. - * - * 'flow' must be the flow corresponding to 'packet' and 'packet''s header - * pointers must be properly initialized (e.g. with flow_extract()). */ -uint16_t -packet_get_tcp_flags(const struct ofpbuf *packet, const struct flow *flow) -{ - if (dl_type_is_ip_any(flow->dl_type) && - flow->nw_proto == IPPROTO_TCP && packet->l7) { - const struct tcp_header *tcp = packet->l4; - return TCP_FLAGS(tcp->tcp_ctl); - } else { - return 0; - } -} - const char * packet_tcp_flag_to_string(uint32_t flag) { @@ -945,7 +929,7 @@ packet_tcp_flag_to_string(uint32_t flag) } /* Appends a string representation of the TCP flags value 'tcp_flags' - * (e.g. obtained via packet_get_tcp_flags() or TCP_FLAGS) to 's', in the + * (e.g. from struct flow.tcp_flags or obtained via TCP_FLAGS) to 's', in the * format used by tcpdump. */ void packet_format_tcp_flags(struct ds *s, uint16_t tcp_flags) diff --git a/lib/packets.h b/lib/packets.h index 24d61a95a..18a3b17ca 100644 --- a/lib/packets.h +++ b/lib/packets.h @@ -666,7 +666,6 @@ void packet_set_tcp_port(struct ofpbuf *, ovs_be16 src, ovs_be16 dst); void packet_set_udp_port(struct ofpbuf *, ovs_be16 src, ovs_be16 dst); void packet_set_sctp_port(struct ofpbuf *, ovs_be16 src, ovs_be16 dst); -uint16_t packet_get_tcp_flags(const struct ofpbuf *, const struct flow *); void packet_format_tcp_flags(struct ds *, uint16_t); const char *packet_tcp_flag_to_string(uint32_t flag); -- 2.20.1