| Message ID | 1445936735-13729-3-git-send-email-rbryant@redhat.com |
|---|---|
| State | Accepted |
| Headers | show |
On Tue, Oct 27, 2015 at 06:05:35PM +0900, Russell Bryant wrote: > This changed from 2 to 3 when ACLs got implemented, as it turned out > ACLs needed two tables (1 and 2). > > While we're at it, do a bit of OCD formatting cleanup by fixing the > alignment of '\' at the end of each line in the logical flow table > defininitions. > > Signed-off-by: Russell Bryant <rbryant@redhat.com> Acked-by: Ben Pfaff <blp@nicira.com>
On 11/03/2015 03:34 PM, Ben Pfaff wrote: > On Tue, Oct 27, 2015 at 06:05:35PM +0900, Russell Bryant wrote: >> This changed from 2 to 3 when ACLs got implemented, as it turned out >> ACLs needed two tables (1 and 2). >> >> While we're at it, do a bit of OCD formatting cleanup by fixing the >> alignment of '\' at the end of each line in the logical flow table >> defininitions. >> >> Signed-off-by: Russell Bryant <rbryant@redhat.com> > > Acked-by: Ben Pfaff <blp@nicira.com> > Thanks for the reviews! I pushed this series to master.
diff --git a/ovn/northd/ovn-northd.c b/ovn/northd/ovn-northd.c index 60786d2..b196837 100644 --- a/ovn/northd/ovn-northd.c +++ b/ovn/northd/ovn-northd.c @@ -86,12 +86,12 @@ enum ovn_stage { #define PIPELINE_STAGES \ /* Logical switch ingress stages. */ \ PIPELINE_STAGE(SWITCH, IN, PORT_SEC, 0, "switch_in_port_sec") \ - PIPELINE_STAGE(SWITCH, IN, PRE_ACL, 1, "switch_in_pre_acl") \ + PIPELINE_STAGE(SWITCH, IN, PRE_ACL, 1, "switch_in_pre_acl") \ PIPELINE_STAGE(SWITCH, IN, ACL, 2, "switch_in_acl") \ PIPELINE_STAGE(SWITCH, IN, L2_LKUP, 3, "switch_in_l2_lkup") \ \ /* Logical switch egress stages. */ \ - PIPELINE_STAGE(SWITCH, OUT, PRE_ACL, 0, "switch_out_pre_acl") \ + PIPELINE_STAGE(SWITCH, OUT, PRE_ACL, 0, "switch_out_pre_acl") \ PIPELINE_STAGE(SWITCH, OUT, ACL, 1, "switch_out_acl") \ PIPELINE_STAGE(SWITCH, OUT, PORT_SEC, 2, "switch_out_port_sec") \ \ @@ -1151,7 +1151,7 @@ build_lswitch_flows(struct hmap *datapaths, struct hmap *ports, ds_destroy(&match); } - /* Ingress table 2: Destination lookup, broadcast and multicast handling + /* Ingress table 3: Destination lookup, broadcast and multicast handling * (priority 100). */ HMAP_FOR_EACH (op, key_node, ports) { if (!op->nbs) {
This changed from 2 to 3 when ACLs got implemented, as it turned out ACLs needed two tables (1 and 2). While we're at it, do a bit of OCD formatting cleanup by fixing the alignment of '\' at the end of each line in the logical flow table defininitions. Signed-off-by: Russell Bryant <rbryant@redhat.com> --- ovn/northd/ovn-northd.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)