Use "policing-*" instead of "policing_*" in config.

The keys to enable policing used a "_" to separate words, but everything
else in vswitchd.conf uses a "-".  Use a "-" to be consistent.

diff --git a/vswitchd/port.c b/vswitchd/port.c
index 419e832dc7c868ab3a88eea32e8fc5d31414fd72..a600be62012a35910b6663d8dda07bd5386ad64e 100644 (file)
--- a/vswitchd/port.c
+++ b/vswitchd/port.c
@@ -44,9 +44,9 @@ static struct svec all_ports = SVEC_EMPTY_INITIALIZER;
 static int
 set_ingress_policing(const char *port_name) 
 {
-    int kbits_rate = cfg_get_int(0, "port.%s.ingress.policing_rate", 
+    int kbits_rate = cfg_get_int(0, "port.%s.ingress.policing-rate", 
             port_name);
-    int kbits_burst = cfg_get_int(0, "port.%s.ingress.policing_burst", 
+    int kbits_burst = cfg_get_int(0, "port.%s.ingress.policing-burst", 
             port_name);
 
     return netdev_nodev_set_policing(port_name, kbits_rate, kbits_burst);

diff --git a/vswitchd/vswitchd.conf.5.in b/vswitchd/vswitchd.conf.5.in
index 5399ac5042c12b64fdd1b569038be806a93c1527..b4df70268a38d9a4b8282e0fbd04d870e6980c0c 100644 (file)
--- a/vswitchd/vswitchd.conf.5.in
+++ b/vswitchd/vswitchd.conf.5.in
@@ -297,13 +297,13 @@ specified in kilobits (1000 bits).  The burst size should be at least
 the size of the port's MTU. 
 
 A port may be configured to enforce ingress policing by defining the
-key \fBport.\fIname\fB.ingress.policing_rate\fR with an integer
+key \fBport.\fIname\fB.ingress.policing-rate\fR with an integer
 indicating the rate.  The port \fIname\fR will only allow traffic to be
 received at the rate specified in kilobits per second.  If the rate is zero 
 or the key is not defined, then ingress policing is disabled.
 
 If ingress policing is enabled, then the burst rate may be set by defining 
-the key \fBport.\fIname\fB.ingress.policing_burst\fR with an integer 
+the key \fBport.\fIname\fB.ingress.policing-burst\fR with an integer 
 indicating the burst rate in kilobits.  If a key is not supplied or is 
 zero, then the default burst is 10 kilobits.
 
@@ -314,8 +314,8 @@ The following syntax limits port \fBeth1\fR to receiving traffic at
 .RS
 .nf
 
-port.eth1.ingress.policing_rate=512
-port.eth1.ingress.policing_burst=20
+port.eth1.ingress.policing-rate=512
+port.eth1.ingress.policing-burst=20
 
 .fi
 .SS "IEEE 802.1D-1998 Spanning Tree Support"