Reduce scope of per-protocol variables in ofputil_encode_flow_mod()
These variables are only needed in one of the cases covered by the switch
statement and will increase in number as more cases (protocols) are
supported.
Signed-off-by: Simon Horman <ho...@verge.net.au>
---
v7
* No change
v6
* Manual Rebase
v5
* No change
v5
* No change
v4
* No change
v3
* No change
v2
* No change
Conflicts:
lib/ofp-util.c
---
lib/ofp-util.c | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/lib/ofp-util.c b/lib/ofp-util.c
index 8d0f993..b2432f7 100644
--- a/lib/ofp-util.c
+++ b/lib/ofp-util.c
@@ -1262,11 +1262,8 @@ struct ofpbuf *
ofputil_encode_flow_mod(const struct ofputil_flow_mod *fm,
enum ofputil_protocol protocol)
{
- struct ofp10_flow_mod *ofm;
- struct nx_flow_mod *nfm;
struct ofpbuf *msg;
uint16_t command;
- int match_len;
command = (protocol & OFPUTIL_P_TID
? (fm->command & 0xff) | (fm->table_id << 8)
@@ -1274,7 +1271,9 @@ ofputil_encode_flow_mod(const struct ofputil_flow_mod *fm,
switch (protocol) {
case OFPUTIL_P_OF10:
- case OFPUTIL_P_OF10_TID:
+ case OFPUTIL_P_OF10_TID: {
+ struct ofp10_flow_mod *ofm;
+
msg = ofpraw_alloc(OFPRAW_OFPT10_FLOW_MOD, OFP10_VERSION,
fm->ofpacts_len);
ofm = ofpbuf_put_zeros(msg, sizeof *ofm);
@@ -1288,9 +1287,13 @@ ofputil_encode_flow_mod(const struct ofputil_flow_mod
*fm,
ofm->out_port = htons(fm->out_port);
ofm->flags = htons(fm->flags);
break;
+ }
case OFPUTIL_P_NXM:
- case OFPUTIL_P_NXM_TID:
+ case OFPUTIL_P_NXM_TID: {
+ struct nx_flow_mod *nfm;
+ int match_len;
+
msg = ofpraw_alloc(OFPRAW_NXT_FLOW_MOD, OFP10_VERSION,
NXM_TYPICAL_LEN + fm->ofpacts_len);
nfm = ofpbuf_put_zeros(msg, sizeof *nfm);
@@ -1307,6 +1310,7 @@ ofputil_encode_flow_mod(const struct ofputil_flow_mod *fm,
nfm->flags = htons(fm->flags);
nfm->match_len = htons(match_len);
break;
+ }
case OFPUTIL_P_OF12:
default:
--
1.7.10.2.484.gcd07cc5
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
