diff options
| -rw-r--r-- | include/linux/openvswitch.h | 4 | ||||
| -rw-r--r-- | lib/dpif-netdev.c | 2 | ||||
| -rw-r--r-- | lib/odp-util.c | 2 | ||||
| -rw-r--r-- | ofproto/ofproto-dpif-xlate.c | 4 | ||||
| -rw-r--r-- | ofproto/ofproto-dpif-xlate.h | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/include/linux/openvswitch.h b/include/linux/openvswitch.h index e17f802b1..1aa9158f3 100644 --- a/include/linux/openvswitch.h +++ b/include/linux/openvswitch.h @@ -553,11 +553,11 @@ enum ovs_hash_alg { /* * struct ovs_action_hash - %OVS_ACTION_ATTR_HASH action argument. * @hash_alg: Algorithm used to compute hash prior to recirculation. - * @hash_bias: bias used for computing hash. + * @hash_basis: basis used for computing hash. */ struct ovs_action_hash { uint32_t hash_alg; /* One of ovs_hash_alg. */ - uint32_t hash_bias; + uint32_t hash_basis; }; /** diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c index 15aa42a03..07f181d1e 100644 --- a/lib/dpif-netdev.c +++ b/lib/dpif-netdev.c @@ -2160,7 +2160,7 @@ dp_execute_cb(void *aux_, struct ofpbuf *packet, if (hash_act->hash_alg == OVS_HASH_ALG_L4) { /* Hash need not be symmetric, nor does it need to include * L2 fields. */ - hash = miniflow_hash_5tuple(aux->key, hash_act->hash_bias); + hash = miniflow_hash_5tuple(aux->key, hash_act->hash_basis); if (!hash) { hash = 1; /* 0 is not valid */ } diff --git a/lib/odp-util.c b/lib/odp-util.c index 9a4ea5e06..8e95c9e96 100644 --- a/lib/odp-util.c +++ b/lib/odp-util.c @@ -399,7 +399,7 @@ format_odp_hash_action(struct ds *ds, const struct ovs_action_hash *hash_act) ds_put_format(ds, "hash("); if (hash_act->hash_alg == OVS_HASH_ALG_L4) { - ds_put_format(ds, "hash_l4(%"PRIu32")", hash_act->hash_bias); + ds_put_format(ds, "hash_l4(%"PRIu32")", hash_act->hash_basis); } else { ds_put_format(ds, "Unknown hash algorithm(%"PRIu32")", hash_act->hash_alg); diff --git a/ofproto/ofproto-dpif-xlate.c b/ofproto/ofproto-dpif-xlate.c index e4e824632..248382fc2 100644 --- a/ofproto/ofproto-dpif-xlate.c +++ b/ofproto/ofproto-dpif-xlate.c @@ -1217,7 +1217,7 @@ output_normal(struct xlate_ctx *ctx, const struct xbundle *out_xbundle, if (ctx->xbridge->enable_recirc) { ctx->xout->use_recirc = bond_may_recirc( - out_xbundle->bond, &xr->recirc_id, &xr->hash_bias); + out_xbundle->bond, &xr->recirc_id, &xr->hash_basis); if (ctx->xout->use_recirc) { /* Only TCP mode uses recirculation. */ @@ -1959,7 +1959,7 @@ compose_output_action__(struct xlate_ctx *ctx, ofp_port_t ofp_port, OVS_ACTION_ATTR_HASH, sizeof *act_hash); act_hash->hash_alg = xr->hash_alg; - act_hash->hash_bias = xr->hash_bias; + act_hash->hash_basis = xr->hash_basis; /* Recirc action. */ nl_msg_put_u32(&ctx->xout->odp_actions, OVS_ACTION_ATTR_RECIRC, diff --git a/ofproto/ofproto-dpif-xlate.h b/ofproto/ofproto-dpif-xlate.h index f1267fbf5..18137d5d5 100644 --- a/ofproto/ofproto-dpif-xlate.h +++ b/ofproto/ofproto-dpif-xlate.h @@ -36,7 +36,7 @@ struct xlate_cache; struct xlate_recirc { uint32_t recirc_id; /* !0 Use recirculation instead of output. */ uint8_t hash_alg; /* !0 Compute hash for recirc before. */ - uint32_t hash_bias; /* Compute hash for recirc before. */ + uint32_t hash_basis; /* Compute hash for recirc before. */ }; struct xlate_out { |