projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
stream-ssl: Force CA cert file to be read when it appears during bootstrap.
[openvswitch]
/
lib
/
nx-match.c
diff --git
a/lib/nx-match.c
b/lib/nx-match.c
index 4d2e590e5a4578db891fa5ec2de5a177e2b955aa..f5d62de2f0349a3cadc0cc59016a4a9c88552037 100644
(file)
--- a/
lib/nx-match.c
+++ b/
lib/nx-match.c
@@
-176,9
+176,6
@@
parse_nxm_entry(struct cls_rule *rule, const struct nxm_field *f,
/* Metadata. */
case NFI_NXM_OF_IN_PORT:
flow->in_port = ntohs(get_unaligned_be16(value));
/* Metadata. */
case NFI_NXM_OF_IN_PORT:
flow->in_port = ntohs(get_unaligned_be16(value));
- if (flow->in_port == OFPP_LOCAL) {
- flow->in_port = ODPP_LOCAL;
- }
return 0;
/* Ethernet header. */
return 0;
/* Ethernet header. */
@@
-680,7
+677,7
@@
nxm_put_eth(struct ofpbuf *b, uint32_t header,
static void
nxm_put_eth_dst(struct ofpbuf *b,
static void
nxm_put_eth_dst(struct ofpbuf *b,
-
uint32
_t wc, const uint8_t value[ETH_ADDR_LEN])
+
flow_wildcards
_t wc, const uint8_t value[ETH_ADDR_LEN])
{
switch (wc & (FWW_DL_DST | FWW_ETH_MCAST)) {
case FWW_DL_DST | FWW_ETH_MCAST:
{
switch (wc & (FWW_DL_DST | FWW_ETH_MCAST)) {
case FWW_DL_DST | FWW_ETH_MCAST:
@@
-739,9
+736,6
@@
nx_put_match(struct ofpbuf *b, const struct cls_rule *cr)
/* Metadata. */
if (!(wc & FWW_IN_PORT)) {
uint16_t in_port = flow->in_port;
/* Metadata. */
if (!(wc & FWW_IN_PORT)) {
uint16_t in_port = flow->in_port;
- if (in_port == ODPP_LOCAL) {
- in_port = OFPP_LOCAL;
- }
nxm_put_16(b, NXM_OF_IN_PORT, htons(in_port));
}
nxm_put_16(b, NXM_OF_IN_PORT, htons(in_port));
}
@@
-1272,7
+1266,7
@@
nxm_read_field(const struct nxm_field *src, const struct flow *flow)
{
switch (src->index) {
case NFI_NXM_OF_IN_PORT:
{
switch (src->index) {
case NFI_NXM_OF_IN_PORT:
- return flow->in_port
== ODPP_LOCAL ? OFPP_LOCAL : flow->in_port
;
+ return flow->in_port;
case NFI_NXM_OF_ETH_DST:
return eth_addr_to_uint64(flow->dl_dst);
case NFI_NXM_OF_ETH_DST:
return eth_addr_to_uint64(flow->dl_dst);