[ovs-dev] [PATCH v2 1/3] ofp-actions: Style fixes.

[Jarno Rajahalme]

Replace a tab by a space and remove an unnecessary variable.

Signed-off-by: Jarno Rajahalme <jarno at ovn.org>
---
 include/openvswitch/ofp-actions.h | 2 +-
 lib/ofp-actions.c                 | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/include/openvswitch/ofp-actions.h b/include/openvswitch/ofp-actions.h
index 67e84fa..74e9dcc 100644
--- a/include/openvswitch/ofp-actions.h
+++ b/include/openvswitch/ofp-actions.h
@@ -556,7 +556,7 @@ enum nx_conntrack_flags {
 #define NX_CT_RECIRC_NONE OFPTT_ALL
 
 #if !defined(IPPORT_FTP)
-#define	IPPORT_FTP  21
+#define IPPORT_FTP  21
 #endif
 
 /* OFPACT_CT.
diff --git a/lib/ofp-actions.c b/lib/ofp-actions.c
index 22c7b16..6fea508 100644
--- a/lib/ofp-actions.c
+++ b/lib/ofp-actions.c
@@ -7029,7 +7029,6 @@ ofpact_check__(enum ofputil_protocol *usable_protocols, struct ofpact *a,
 
     case OFPACT_CT: {
         struct ofpact_conntrack *oc = ofpact_get_CT(a);
-        enum ofperr err;
 
         if (!dl_type_is_ip_any(flow->dl_type)
             || (flow->ct_state & CS_INVALID && oc->flags & NX_CT_F_COMMIT)) {
@@ -7040,10 +7039,9 @@ ofpact_check__(enum ofputil_protocol *usable_protocols, struct ofpact *a,
             return mf_check_src(&oc->zone_src, flow);
         }
 
-        err = ofpacts_check(oc->actions, ofpact_ct_get_action_len(oc),
-                            flow, max_ports, table_id, n_tables,
-                            usable_protocols);
-        return err;
+        return ofpacts_check(oc->actions, ofpact_ct_get_action_len(oc),
+                             flow, max_ports, table_id, n_tables,
+                             usable_protocols);
     }
 
     case OFPACT_NAT: {
-- 
2.1.4