[ovs-dev,1/3] OVN: rename encode_nested_neighbor_actions in encode_nested_actions

Message ID 5bbad74b5b17ba584f481d2d6d730b1f427d4326.1518532822.git.lorenzo.bianconi@redhat.com
State Accepted
Headers show
Series
  • add acl reject rule support introducing icmp4 action
Related show

Commit Message

Lorenzo Bianconi Feb. 13, 2018, 2:43 p.m.
Rename encode_nested_neighbor_actions routine in encode_nested_actions
in order to have a more general name for nested actions encoder.

Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi@redhat.com>
---
 ovn/lib/actions.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

Comments

Ben Pfaff Feb. 14, 2018, 11:25 p.m. | #1
On Tue, Feb 13, 2018 at 03:43:50PM +0100, Lorenzo Bianconi wrote:
> Rename encode_nested_neighbor_actions routine in encode_nested_actions
> in order to have a more general name for nested actions encoder.
> 
> Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi@redhat.com>

Thanks, I applied this patch to master.

Patch

diff --git a/ovn/lib/actions.c b/ovn/lib/actions.c
index a6977d8ee..fde3bff00 100644
--- a/ovn/lib/actions.c
+++ b/ovn/lib/actions.c
@@ -1193,10 +1193,10 @@  format_CLONE(const struct ovnact_nest *nest, struct ds *s)
 }
 
 static void
-encode_nested_neighbor_actions(const struct ovnact_nest *on,
-                               const struct ovnact_encode_params *ep,
-                               enum action_opcode opcode,
-                               struct ofpbuf *ofpacts)
+encode_nested_actions(const struct ovnact_nest *on,
+                      const struct ovnact_encode_params *ep,
+                      enum action_opcode opcode,
+                      struct ofpbuf *ofpacts)
 {
     /* Convert nested actions into ofpacts. */
     uint64_t inner_ofpacts_stub[1024 / 8];
@@ -1221,7 +1221,7 @@  encode_ARP(const struct ovnact_nest *on,
            const struct ovnact_encode_params *ep,
            struct ofpbuf *ofpacts)
 {
-    encode_nested_neighbor_actions(on, ep, ACTION_OPCODE_ARP, ofpacts);
+    encode_nested_actions(on, ep, ACTION_OPCODE_ARP, ofpacts);
 }
 
 static void
@@ -1229,7 +1229,7 @@  encode_ND_NA(const struct ovnact_nest *on,
              const struct ovnact_encode_params *ep,
              struct ofpbuf *ofpacts)
 {
-    encode_nested_neighbor_actions(on, ep, ACTION_OPCODE_ND_NA, ofpacts);
+    encode_nested_actions(on, ep, ACTION_OPCODE_ND_NA, ofpacts);
 }
 
 static void
@@ -1237,7 +1237,7 @@  encode_ND_NS(const struct ovnact_nest *on,
              const struct ovnact_encode_params *ep,
              struct ofpbuf *ofpacts)
 {
-    encode_nested_neighbor_actions(on, ep, ACTION_OPCODE_ND_NS, ofpacts);
+    encode_nested_actions(on, ep, ACTION_OPCODE_ND_NS, ofpacts);
 }
 
 static void