eth_mpls_depth() has been unused as of 1ac7c9bdb2b6fdcb ("ofproto-dpif: Use
execute_actions to execute controller actions").
Signed-off-by: Simon Horman <ho...@verge.net.au>
---
lib/packets.c | 26 --------------------------
lib/packets.h | 2 --
2 files changed, 28 deletions(-)
diff --git a/lib/packets.c b/lib/packets.c
index 2bee709..922c5db 100644
--- a/lib/packets.c
+++ b/lib/packets.c
@@ -218,32 +218,6 @@ eth_pop_vlan(struct ofpbuf *packet)
}
}
-/* Return depth of mpls stack.
- *
- * 'packet->l2_5' should initially point to 'packet''s outer-most MPLS header
- * or may be NULL if there are no MPLS headers. */
-uint16_t
-eth_mpls_depth(const struct ofpbuf *packet)
-{
- struct mpls_hdr *mh = packet->l2_5;
- uint16_t depth;
-
- if (!mh) {
- return 0;
- }
-
- depth = 0;
- while (packet->size >= ((char *)mh - (char *)packet->data) + sizeof *mh) {
- depth++;
- if (mh->mpls_lse & htonl(MPLS_BOS_MASK)) {
- break;
- }
- mh++;
- }
-
- return depth;
-}
-
/* Set ethertype of the packet. */
void
set_ethertype(struct ofpbuf *packet, ovs_be16 eth_type)
diff --git a/lib/packets.h b/lib/packets.h
index b776914..7388152 100644
--- a/lib/packets.h
+++ b/lib/packets.h
@@ -143,8 +143,6 @@ void compose_rarp(struct ofpbuf *, const uint8_t
eth_src[ETH_ADDR_LEN]);
void eth_push_vlan(struct ofpbuf *, ovs_be16 tci);
void eth_pop_vlan(struct ofpbuf *);
-uint16_t eth_mpls_depth(const struct ofpbuf *packet);
-
void set_ethertype(struct ofpbuf *packet, ovs_be16 eth_type);
const char *eth_from_hex(const char *hex, struct ofpbuf **packetp);
--
1.8.4
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
