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
DESIGN: Fix alignment in table.
[sliver-openvswitch.git]
/
lib
/
ofp-parse.c
diff --git
a/lib/ofp-parse.c
b/lib/ofp-parse.c
index
c630ccd
..
3f7a021
100644
(file)
--- a/
lib/ofp-parse.c
+++ b/
lib/ofp-parse.c
@@
-124,7
+124,7
@@
put_output_action(struct ofpbuf *b, uint16_t port)
{
struct ofp_action_output *oao;
{
struct ofp_action_output *oao;
- oao = ofputil_put_OFPAT_OUTPUT(b);
+ oao = ofputil_put_OFPAT
10
_OUTPUT(b);
oao->port = htons(port);
return oao;
}
oao->port = htons(port);
return oao;
}
@@
-141,7
+141,7
@@
parse_enqueue(struct ofpbuf *b, char *arg)
ovs_fatal(0, "\"enqueue\" syntax is \"enqueue:PORT:QUEUE\"");
}
ovs_fatal(0, "\"enqueue\" syntax is \"enqueue:PORT:QUEUE\"");
}
- oae = ofputil_put_OFPAT_ENQUEUE(b);
+ oae = ofputil_put_OFPAT
10
_ENQUEUE(b);
oae->port = htons(str_to_u32(port));
oae->queue_id = htonl(str_to_u32(queue));
}
oae->port = htons(str_to_u32(port));
oae->queue_id = htonl(str_to_u32(queue));
}
@@
-320,47
+320,47
@@
parse_named_action(enum ofputil_action_code code, const struct flow *flow,
struct ofp_action_tp_port *oata;
switch (code) {
struct ofp_action_tp_port *oata;
switch (code) {
- case OFPUTIL_OFPAT_OUTPUT:
+ case OFPUTIL_OFPAT
10
_OUTPUT:
parse_output(b, arg);
break;
parse_output(b, arg);
break;
- case OFPUTIL_OFPAT_SET_VLAN_VID:
- oavv = ofputil_put_OFPAT_SET_VLAN_VID(b);
+ case OFPUTIL_OFPAT
10
_SET_VLAN_VID:
+ oavv = ofputil_put_OFPAT
10
_SET_VLAN_VID(b);
oavv->vlan_vid = htons(str_to_u32(arg));
break;
oavv->vlan_vid = htons(str_to_u32(arg));
break;
- case OFPUTIL_OFPAT_SET_VLAN_PCP:
- oavp = ofputil_put_OFPAT_SET_VLAN_PCP(b);
+ case OFPUTIL_OFPAT
10
_SET_VLAN_PCP:
+ oavp = ofputil_put_OFPAT
10
_SET_VLAN_PCP(b);
oavp->vlan_pcp = str_to_u32(arg);
break;
oavp->vlan_pcp = str_to_u32(arg);
break;
- case OFPUTIL_OFPAT_STRIP_VLAN:
- ofputil_put_OFPAT_STRIP_VLAN(b);
+ case OFPUTIL_OFPAT
10
_STRIP_VLAN:
+ ofputil_put_OFPAT
10
_STRIP_VLAN(b);
break;
break;
- case OFPUTIL_OFPAT_SET_DL_SRC:
- case OFPUTIL_OFPAT_SET_DL_DST:
+ case OFPUTIL_OFPAT
10
_SET_DL_SRC:
+ case OFPUTIL_OFPAT
10
_SET_DL_DST:
oada = ofputil_put_action(code, b);
str_to_mac(arg, oada->dl_addr);
break;
oada = ofputil_put_action(code, b);
str_to_mac(arg, oada->dl_addr);
break;
- case OFPUTIL_OFPAT_SET_NW_SRC:
- case OFPUTIL_OFPAT_SET_NW_DST:
+ case OFPUTIL_OFPAT
10
_SET_NW_SRC:
+ case OFPUTIL_OFPAT
10
_SET_NW_DST:
oana = ofputil_put_action(code, b);
str_to_ip(arg, &oana->nw_addr);
break;
oana = ofputil_put_action(code, b);
str_to_ip(arg, &oana->nw_addr);
break;
- case OFPUTIL_OFPAT_SET_NW_TOS:
- ofputil_put_OFPAT_SET_NW_TOS(b)->nw_tos = str_to_u32(arg);
+ case OFPUTIL_OFPAT
10
_SET_NW_TOS:
+ ofputil_put_OFPAT
10
_SET_NW_TOS(b)->nw_tos = str_to_u32(arg);
break;
break;
- case OFPUTIL_OFPAT_SET_TP_SRC:
- case OFPUTIL_OFPAT_SET_TP_DST:
+ case OFPUTIL_OFPAT
10
_SET_TP_SRC:
+ case OFPUTIL_OFPAT
10
_SET_TP_DST:
oata = ofputil_put_action(code, b);
oata->tp_port = htons(str_to_u32(arg));
break;
oata = ofputil_put_action(code, b);
oata->tp_port = htons(str_to_u32(arg));
break;
- case OFPUTIL_OFPAT_ENQUEUE:
+ case OFPUTIL_OFPAT
10
_ENQUEUE:
parse_enqueue(b, arg);
break;
parse_enqueue(b, arg);
break;