Acked-by: Ethan Jackson <et...@nicira.com>
On Fri, Oct 12, 2012 at 1:06 PM, Ben Pfaff <b...@nicira.com> wrote:
> I like the sound of "evicton" but it isn't a real word.
>
> Signed-off-by: Ben Pfaff <b...@nicira.com>
> ---
> ofproto/ofproto.c | 2 +-
> ofproto/ofproto.h | 2 +-
> vswitchd/bridge.c | 2 +-
> 3 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/ofproto/ofproto.c b/ofproto/ofproto.c
> index 9d25a13..9003a2d 100644
> --- a/ofproto/ofproto.c
> +++ b/ofproto/ofproto.c
> @@ -379,7 +379,7 @@ ofproto_create(const char *datapath_name, const char
> *datapath_type,
> hash_string(ofproto->name, 0));
> ofproto->datapath_id = 0;
> ofproto_set_flow_eviction_threshold(ofproto,
> -
> OFPROTO_FLOW_EVICTON_THRESHOLD_DEFAULT);
> +
> OFPROTO_FLOW_EVICTION_THRESHOLD_DEFAULT);
> ofproto->forward_bpdu = false;
> ofproto->fallback_dpid = pick_fallback_dpid();
> ofproto->mfr_desc = xstrdup(DEFAULT_MFR_DESC);
> diff --git a/ofproto/ofproto.h b/ofproto/ofproto.h
> index 32a00f2..5599cd6 100644
> --- a/ofproto/ofproto.h
> +++ b/ofproto/ofproto.h
> @@ -190,7 +190,7 @@ int ofproto_port_dump_done(struct ofproto_port_dump *);
> : (ofproto_port_dump_done(DUMP), false)); \
> )
>
> -#define OFPROTO_FLOW_EVICTON_THRESHOLD_DEFAULT 1000
> +#define OFPROTO_FLOW_EVICTION_THRESHOLD_DEFAULT 1000
> #define OFPROTO_FLOW_EVICTION_THRESHOLD_MIN 100
>
> int ofproto_port_add(struct ofproto *, struct netdev *, uint16_t *ofp_portp);
> diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c
> index d161c4c..b9df794 100644
> --- a/vswitchd/bridge.c
> +++ b/vswitchd/bridge.c
> @@ -1417,7 +1417,7 @@ bridge_configure_flow_eviction_threshold(struct bridge
> *br)
> if (threshold_str) {
> threshold = strtoul(threshold_str, NULL, 10);
> } else {
> - threshold = OFPROTO_FLOW_EVICTON_THRESHOLD_DEFAULT;
> + threshold = OFPROTO_FLOW_EVICTION_THRESHOLD_DEFAULT;
> }
> ofproto_set_flow_eviction_threshold(br->ofproto, threshold);
> }
> --
> 1.7.2.5
>
> _______________________________________________
> dev mailing list
> dev@openvswitch.org
> http://openvswitch.org/mailman/listinfo/dev
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
