git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix fake shutdown of external nodes
[sliver-openvswitch.git]
/
lib
/
packets.c
diff --git
a/lib/packets.c
b/lib/packets.c
index
424f7ac
..
77aa7d3
100644
(file)
--- a/
lib/packets.c
+++ b/
lib/packets.c
@@
-259,7
+259,7
@@
static bool is_mpls(struct ofpbuf *packet)
}
/* Set time to live (TTL) of an MPLS label stack entry (LSE). */
}
/* Set time to live (TTL) of an MPLS label stack entry (LSE). */
-
static
void
+void
set_mpls_lse_ttl(ovs_be32 *lse, uint8_t ttl)
{
*lse &= ~htonl(MPLS_TTL_MASK);
set_mpls_lse_ttl(ovs_be32 *lse, uint8_t ttl)
{
*lse &= ~htonl(MPLS_TTL_MASK);
@@
-887,7
+887,8
@@
packet_set_udp_port(struct ofpbuf *packet, ovs_be16 src, ovs_be16 dst)
uint8_t
packet_get_tcp_flags(const struct ofpbuf *packet, const struct flow *flow)
{
uint8_t
packet_get_tcp_flags(const struct ofpbuf *packet, const struct flow *flow)
{
- if (is_ip_any(flow) && flow->nw_proto == IPPROTO_TCP && packet->l7) {
+ 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 {
const struct tcp_header *tcp = packet->l4;
return TCP_FLAGS(tcp->tcp_ctl);
} else {