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
Remove encal_dl_type from struct flow
[sliver-openvswitch.git]
/
lib
/
packets.c
diff --git
a/lib/packets.c
b/lib/packets.c
index
c33ae08
..
77aa7d3
100644
(file)
--- a/
lib/packets.c
+++ b/
lib/packets.c
@@
-887,8
+887,7
@@
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)
{
- ovs_be16 dl_type = flow_innermost_dl_type(flow);
- if (dl_type_is_ip_any(dl_type) &&
+ 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);
flow->nw_proto == IPPROTO_TCP && packet->l7) {
const struct tcp_header *tcp = packet->l4;
return TCP_FLAGS(tcp->tcp_ctl);