mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-08-31 22:35:15 +00:00
Code Issues Releases Wiki Activity

ofp-actions: Style fixes.

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

Signed-off-by: Jarno Rajahalme <jarno@ovn.org>
Acked-by: Joe Stringer <joe@ovn.org>
This commit is contained in:
Jarno Rajahalme
2016-09-27 14:45:34 -07:00
parent 70d0cd0678
commit 9f02d70c11
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/openvswitch/ofp-actions.h
View File

@@ -556,7 +556,7 @@ enum nx_conntrack_flags {
#define NX_CT_RECIRC_NONE OFPTT_ALL #define NX_CT_RECIRC_NONE OFPTT_ALL
#if !defined(IPPORT_FTP) #if !defined(IPPORT_FTP)
#define IPPORT_FTP 21 #define IPPORT_FTP 21
#endif #endif
/* OFPACT_CT. /* OFPACT_CT.

8
lib/ofp-actions.c
View File

@@ -7029,7 +7029,6 @@ ofpact_check__(enum ofputil_protocol *usable_protocols, struct ofpact *a,
case OFPACT_CT: { case OFPACT_CT: {
struct ofpact_conntrack *oc = ofpact_get_CT(a); struct ofpact_conntrack *oc = ofpact_get_CT(a);
enum ofperr err;
if (!dl_type_is_ip_any(flow->dl_type) if (!dl_type_is_ip_any(flow->dl_type)
|| (flow->ct_state & CS_INVALID && oc->flags & NX_CT_F_COMMIT)) { || (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); return mf_check_src(&oc->zone_src, flow);
} }
err = ofpacts_check(oc->actions, ofpact_ct_get_action_len(oc), return ofpacts_check(oc->actions, ofpact_ct_get_action_len(oc),
flow, max_ports, table_id, n_tables, flow, max_ports, table_id, n_tables,
usable_protocols); usable_protocols);
return err;
} }
case OFPACT_NAT: { case OFPACT_NAT: {