Fix the spelling of the word "suppress".

The spelling mistake where "suppress" is written as "surpress" was
sufficiently common and annoyed me enough to fix it.

For backwards compatibility, the CLI and API test tool both still accept
the erroneous spelling.

Change-Id: I82104ae9d8c2c9d6e3396ba0d72cb1dc133081d1
Signed-off-by: Chris Luke <chrisy@flirble.org>

diff --git a/vnet/vnet/ip/ip6.h b/vnet/vnet/ip/ip6.h
index 2a386fe..edeecde 100644 (file)
--- a/vnet/vnet/ip/ip6.h
+++ b/vnet/vnet/ip/ip6.h
@@ -468,7 +468,7 @@ int vnet_set_ip6_flow_hash (u32 table_id, u32 flow_hash_config);
 
 int
 ip6_neighbor_ra_config(vlib_main_t * vm, u32 sw_if_index, 
-                      u8 surpress, u8 managed, u8 other,
+                      u8 suppress, u8 managed, u8 other,
                       u8 ll_option,  u8 send_unicast,  u8 cease, 
                       u8 use_lifetime,  u32 lifetime,
                       u32 initial_count,  u32 initial_interval,  

diff --git a/vnet/vnet/ip/ip6_neighbor.c b/vnet/vnet/ip/ip6_neighbor.c
index f161036..0fe3346 100644 (file)
--- a/vnet/vnet/ip/ip6_neighbor.c
+++ b/vnet/vnet/ip/ip6_neighbor.c
@@ -2229,7 +2229,7 @@ VLIB_REGISTER_NODE (ip6_icmp_neighbor_advertisement_node,static) = {
 /* API  support functions */
 int
 ip6_neighbor_ra_config(vlib_main_t * vm, u32 sw_if_index, 
-                      u8 surpress, u8 managed, u8 other,
+                      u8 suppress, u8 managed, u8 other,
                       u8 ll_option,  u8 send_unicast,  u8 cease, 
                       u8 use_lifetime,  u32 lifetime,
                       u32 initial_count,  u32 initial_interval,  
@@ -2282,7 +2282,7 @@ ip6_neighbor_ra_config(vlib_main_t * vm, u32 sw_if_index,
         if "flag" is set and is_no is true then restore default value else set value corresponding to "flag" 
         if "flag" is clear  don't change corresponding value  
       */
-      radv_info->send_radv =  (surpress != 0) ? ( (is_no  != 0) ? 1 : 0 ) : radv_info->send_radv;
+      radv_info->send_radv =  (suppress != 0) ? ( (is_no  != 0) ? 1 : 0 ) : radv_info->send_radv;
       radv_info->adv_managed_flag = ( managed  != 0) ? ( (is_no) ? 0 : 1) : radv_info->adv_managed_flag;
       radv_info->adv_other_flag  = (other  != 0) ? ( (is_no) ?  0: 1) : radv_info->adv_other_flag;
       radv_info->adv_link_layer_address = ( ll_option != 0) ? ( (is_no) ? 1 : 0) : radv_info->adv_link_layer_address;
@@ -2449,8 +2449,8 @@ ip6_neighbor_cmd(vlib_main_t * vm, unformat_input_t * main_input, vlib_cli_comma
   ip6_neighbor_main_t * nm = &ip6_neighbor_main;
   clib_error_t * error = 0;
   u8 is_no = 0;
-  u8 surpress = 0,  managed = 0,  other = 0;
-  u8 surpress_ll_option = 0,  send_unicast = 0,  cease= 0; 
+  u8 suppress = 0,  managed = 0,  other = 0;
+  u8 suppress_ll_option = 0,  send_unicast = 0,  cease= 0; 
   u8 use_lifetime = 0;
   u32 sw_if_index, ra_lifetime = 0, ra_initial_count = 0, ra_initial_interval = 0;
   u32 ra_max_interval = 0 , ra_min_interval = 0;
@@ -2534,14 +2534,16 @@ ip6_neighbor_cmd(vlib_main_t * vm, unformat_input_t * main_input, vlib_cli_comma
          other = 1;
          break;
        }
-      else if (unformat (line_input, "ra-surpress"))
+      else if (unformat (line_input, "ra-suppress") ||
+                     unformat (line_input, "ra-surpress"))
        {
-         surpress = 1;
+         suppress = 1;
          break;
        }
-      else if (unformat (line_input, "ra-surpress-link-layer"))
+      else if (unformat (line_input, "ra-suppress-link-layer") ||
+                     unformat (line_input, "ra-surpress-link-layer"))
        {
-         surpress_ll_option = 1;
+         suppress_ll_option = 1;
          break;
        }
       else if (unformat (line_input, "ra-send-unicast"))
@@ -2583,8 +2585,8 @@ ip6_neighbor_cmd(vlib_main_t * vm, unformat_input_t * main_input, vlib_cli_comma
   if(add_radv_info)
     {
       ip6_neighbor_ra_config(vm,  sw_if_index, 
-                            surpress, managed, other,
-                            surpress_ll_option,  send_unicast,  cease, 
+                            suppress, managed, other,
+                            suppress_ll_option,  send_unicast,  cease, 
                             use_lifetime,  ra_lifetime,
                             ra_initial_count,  ra_initial_interval,  
                             ra_max_interval,  ra_min_interval,

diff --git a/vpp-api-test/vat/api_format.c b/vpp-api-test/vat/api_format.c
index a4fbf0d..ad99869 100644 (file)
--- a/vpp-api-test/vat/api_format.c
+++ b/vpp-api-test/vat/api_format.c
@@ -5743,7 +5743,7 @@ static int api_sw_interface_ip6nd_ra_config (vat_main_t * vam)
     f64 timeout;
     u32 sw_if_index;
     u8 sw_if_index_set = 0;
-    u8 surpress = 0;
+    u8 suppress = 0;
     u8 managed = 0;
     u8 other = 0;
     u8 ll_option = 0;
@@ -5774,8 +5774,8 @@ static int api_sw_interface_ip6nd_ra_config (vat_main_t * vam)
             ;
         else if (unformat (i, "interval %d", &initial_interval))
             ;
-       else if (unformat (i, "surpress"))
-           surpress = 1;
+       else if (unformat (i, "suppress") || unformat (i, "surpress"))
+           suppress = 1;
        else if (unformat (i, "managed"))
            managed = 1;
        else if (unformat (i, "other"))
@@ -5810,7 +5810,7 @@ static int api_sw_interface_ip6nd_ra_config (vat_main_t * vam)
     mp->lifetime = ntohl(lifetime);
     mp->initial_count = ntohl(initial_count);
     mp->initial_interval = ntohl(initial_interval);
-    mp->surpress = surpress;
+    mp->suppress = suppress;
     mp->managed = managed;
     mp->other = other;
     mp->ll_option = ll_option;
@@ -11982,7 +11982,7 @@ _(sw_interface_ip6nd_ra_prefix,                                         \
   "[nolink] [isno]")                                                    \
 _(sw_interface_ip6nd_ra_config,                                         \
   "<intfc> | sw_if_index <id> [maxint <n>] [minint <n>]\n"              \
-  "[life <n>] [count <n>] [interval <n>] [surpress]\n"                  \
+  "[life <n>] [count <n>] [interval <n>] [suppress]\n"                  \
   "[managed] [other] [ll] [send] [cease] [isno] [def]")                 \
 _(set_arp_neighbor_limit, "arp_nbr_limit <n> [ipv6]")                   \
 _(l2_patch_add_del,                                                     \

diff --git a/vpp/vpp-api/api.c b/vpp/vpp-api/api.c
index fbe33fe..9df8791 100644 (file)
--- a/vpp/vpp-api/api.c
+++ b/vpp/vpp-api/api.c
@@ -3111,10 +3111,10 @@ vl_api_sw_interface_ip6nd_ra_config_t_handler
 {
    vl_api_sw_interface_ip6nd_ra_config_reply_t * rmp;
     int rv = 0;
-    u8  is_no,  surpress, managed, other, ll_option, send_unicast, cease, default_router;
+    u8  is_no,  suppress, managed, other, ll_option, send_unicast, cease, default_router;
 
     is_no = mp->is_no == 1;
-    surpress = mp->surpress == 1;
+    suppress = mp->suppress == 1;
     managed = mp->managed == 1;
    other = mp->other == 1;
     ll_option = mp->ll_option == 1;
@@ -3125,7 +3125,7 @@ vl_api_sw_interface_ip6nd_ra_config_t_handler
     VALIDATE_SW_IF_INDEX(mp);
 
     rv = ip6_neighbor_ra_config(vm, ntohl(mp->sw_if_index),
-                               surpress,  managed,  other,
+                               suppress,  managed,  other,
                                ll_option,  send_unicast,  cease,
                                default_router, ntohl (mp->lifetime),
                                ntohl(mp->initial_count),  ntohl(mp->initial_interval),

diff --git a/vpp/vpp-api/custom_dump.c b/vpp/vpp-api/custom_dump.c
index ac90a56..d28882f 100644 (file)
--- a/vpp/vpp-api/custom_dump.c
+++ b/vpp/vpp-api/custom_dump.c
@@ -943,8 +943,8 @@ static void *vl_api_sw_interface_ip6nd_ra_config_t_print
 
     s = format (s, "interval %d ", ntohl(mp->initial_interval));
 
-    if (mp->surpress)
-        s = format (s, "surpress ");
+    if (mp->suppress)
+        s = format (s, "suppress ");
 
     if (mp->managed)
         s = format (s, "managed ");

diff --git a/vpp/vpp-api/test_client.c b/vpp/vpp-api/test_client.c
index 92cf453..99d1012 100644 (file)
--- a/vpp/vpp-api/test_client.c
+++ b/vpp/vpp-api/test_client.c
@@ -1124,7 +1124,7 @@ void ip6nd_ra_config(test_main_t *tm, int is_no)
     mp->sw_if_index = ntohl(5);
     mp->is_no = is_no;
    
-    mp->surpress = 1; 
+    mp->suppress = 1; 
 
 
     mp->_vl_msg_id = ntohs (VL_API_SW_INTERFACE_IP6ND_RA_CONFIG);

diff --git a/vpp/vpp-api/vpe.api b/vpp/vpp-api/vpe.api
index 033ba24..c2fbf2e 100644 (file)
--- a/vpp/vpp-api/vpe.api
+++ b/vpp/vpp-api/vpe.api
@@ -857,7 +857,7 @@ define set_ip_flow_hash_reply {
 /** \brief IPv6 router advertisement config request
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
-    @param surpress -
+    @param suppress -
     @param managed -
     @param other -
     @param ll_option -
@@ -875,7 +875,7 @@ define sw_interface_ip6nd_ra_config {
     u32 client_index;
     u32 context;
     u32 sw_if_index;
-    u8 surpress;
+    u8 suppress;
     u8  managed;
     u8 other;
     u8 ll_option;