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
Setting tag sliver-openvswitch-1.10.90-3
[sliver-openvswitch.git]
/
lib
/
match.c
diff --git
a/lib/match.c
b/lib/match.c
index
512253e
..
6d66eba
100644
(file)
--- a/
lib/match.c
+++ b/
lib/match.c
@@
-271,10
+271,10
@@
match_set_tun_flags_masked(struct match *match, uint16_t flags, uint16_t mask)
}
void
}
void
-match_set_in_port(struct match *match,
uint16
_t ofp_port)
+match_set_in_port(struct match *match,
ofp_port
_t ofp_port)
{
{
- match->wc.masks.in_port
= UINT16_MAX
;
- match->flow.in_port = ofp_port;
+ match->wc.masks.in_port
.ofp_port = u16_to_ofp(UINT16_MAX)
;
+ match->flow.in_port
.ofp_port
= ofp_port;
}
void
}
void
@@
-916,9
+916,9
@@
match_format(const struct match *match, struct ds *s, unsigned int priority)
ntohll(f->metadata), ntohll(wc->masks.metadata));
break;
}
ntohll(f->metadata), ntohll(wc->masks.metadata));
break;
}
- if (wc->masks.in_port) {
+ if (wc->masks.in_port
.ofp_port
) {
ds_put_cstr(s, "in_port=");
ds_put_cstr(s, "in_port=");
- ofputil_format_port(f->in_port, s);
+ ofputil_format_port(f->in_port
.ofp_port
, s);
ds_put_char(s, ',');
}
if (wc->masks.vlan_tci) {
ds_put_char(s, ',');
}
if (wc->masks.vlan_tci) {