From: Ben Pfaff <blp@nicira.com>
Date: Fri, 12 Oct 2012 20:18:41 +0000 (-0700)
Subject: ofproto: Fix typo in macro name.
X-Git-Tag: sliver-openvswitch-1.9.90-1~3^2~52
X-Git-Url: http://git.onelab.eu/?p=sliver-openvswitch.git;a=commitdiff_plain;h=9cac51959920a64ba8de2a6bd4715b8a7fb1a728

ofproto: Fix typo in macro name.

I like the sound of "evicton" but it isn't a real word.

Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Ethan Jackson <ethan@nicira.com>
---

diff --git a/ofproto/ofproto.c b/ofproto/ofproto.c
index 9d25a13f0..9003a2d0e 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 32a00f232..5599cd6a1 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 d161c4c14..b9df794d8 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);
 }