projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ovs-openflowd: Remove documentation for obsolete --mgmt-id option.
[openvswitch]
/
lib
/
vconn.c
diff --git
a/lib/vconn.c
b/lib/vconn.c
index 99d5a54d4e8f572293d3f88a70e25365d49f87fa..80ba471b9a49a8db9787cc19e440e5746a8e6fd5 100644
(file)
--- a/
lib/vconn.c
+++ b/
lib/vconn.c
@@
-1358,6
+1358,7
@@
check_nicira_action(const union ofp_action *a, unsigned int len)
switch (ntohs(nah->subtype)) {
case NXAST_RESUBMIT:
switch (ntohs(nah->subtype)) {
case NXAST_RESUBMIT:
+ case NXAST_SET_TUNNEL:
return check_action_exact_len(a, len, 16);
default:
return ofp_mkerr(OFPET_BAD_ACTION, OFPBAC_BAD_VENDOR_TYPE);
return check_action_exact_len(a, len, 16);
default:
return ofp_mkerr(OFPET_BAD_ACTION, OFPBAC_BAD_VENDOR_TYPE);
@@
-1466,7
+1467,7
@@
normalize_match(struct ofp_match *m)
enum { OFPFW_TP = OFPFW_TP_SRC | OFPFW_TP_DST };
uint32_t wc;
enum { OFPFW_TP = OFPFW_TP_SRC | OFPFW_TP_DST };
uint32_t wc;
- wc = ntohl(m->wildcards) & O
FP
FW_ALL;
+ wc = ntohl(m->wildcards) & O
VS
FW_ALL;
if (wc & OFPFW_DL_TYPE) {
m->dl_type = 0;
if (wc & OFPFW_DL_TYPE) {
m->dl_type = 0;