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

Don't shadow iterator values.

Browse Source 
Signed-off-by: Justin Pettit <jpettit@ovn.org>
Acked-by: Ben Pfaff <blp@ovn.org>
This commit is contained in:
Justin Pettit
2018-02-27 12:32:29 -08:00
parent e883448e3f
commit 97bf8f478d
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/dpif-netdev.c
View File

@@ -3536,7 +3536,7 @@ rxq_scheduling(struct dp_netdev *dp, bool pinned) OVS_REQUIRES(dp->port_mutex)
struct rr_numa_list rr; struct rr_numa_list rr;
struct rr_numa *non_local_numa = NULL; struct rr_numa *non_local_numa = NULL;
struct dp_netdev_rxq ** rxqs = NULL; struct dp_netdev_rxq ** rxqs = NULL;
int i, n_rxqs = 0; int n_rxqs = 0;
struct rr_numa *numa = NULL; struct rr_numa *numa = NULL;
int numa_id; int numa_id;
@@ -3589,7 +3589,7 @@ rxq_scheduling(struct dp_netdev *dp, bool pinned) OVS_REQUIRES(dp->port_mutex)
rr_numa_list_populate(dp, &rr); rr_numa_list_populate(dp, &rr);
/* Assign the sorted queues to pmds in round robin. */ /* Assign the sorted queues to pmds in round robin. */
for (i = 0; i < n_rxqs; i++) { for (int i = 0; i < n_rxqs; i++) {
numa_id = netdev_get_numa_id(rxqs[i]->port->netdev); numa_id = netdev_get_numa_id(rxqs[i]->port->netdev);
numa = rr_numa_list_lookup(&rr, numa_id); numa = rr_numa_list_lookup(&rr, numa_id);
if (!numa) { if (!numa) {

5
lib/nx-match.c
View File

@@ -1025,7 +1025,6 @@ nx_put_raw(struct ofpbuf *b, enum ofp_version oxm, const struct match *match,
ovs_be16 dl_type = get_dl_type(flow); ovs_be16 dl_type = get_dl_type(flow);
ovs_be32 spi_mask; ovs_be32 spi_mask;
int match_len; int match_len;
int i;
BUILD_ASSERT_DECL(FLOW_WC_SEQ == 40); BUILD_ASSERT_DECL(FLOW_WC_SEQ == 40);
@@ -1182,12 +1181,12 @@ nx_put_raw(struct ofpbuf *b, enum ofp_version oxm, const struct match *match,
/* Registers. */ /* Registers. */
if (oxm < OFP15_VERSION) { if (oxm < OFP15_VERSION) {
for (i = 0; i < FLOW_N_REGS; i++) { for (int i = 0; i < FLOW_N_REGS; i++) {
nxm_put_32m(&ctx, MFF_REG0 + i, oxm, nxm_put_32m(&ctx, MFF_REG0 + i, oxm,
htonl(flow->regs[i]), htonl(match->wc.masks.regs[i])); htonl(flow->regs[i]), htonl(match->wc.masks.regs[i]));
} }
} else { } else {
for (i = 0; i < FLOW_N_XREGS; i++) { for (int i = 0; i < FLOW_N_XREGS; i++) {
nxm_put_64m(&ctx, MFF_XREG0 + i, oxm, nxm_put_64m(&ctx, MFF_XREG0 + i, oxm,
htonll(flow_get_xreg(flow, i)), htonll(flow_get_xreg(flow, i)),
htonll(flow_get_xreg(&match->wc.masks, i))); htonll(flow_get_xreg(&match->wc.masks, i)));