projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleanup warnings about "save_ptr" in strtok_r argument
[openvswitch]
/
vswitchd
/
bridge.c
diff --git
a/vswitchd/bridge.c
b/vswitchd/bridge.c
index 10bd2445b9b371b5fcf0eee38d4f556ca7a05381..b1073205df7af9088c74ddd0ca3be36791fe85b8 100644
(file)
--- a/
vswitchd/bridge.c
+++ b/
vswitchd/bridge.c
@@
-1204,7
+1204,7
@@
bridge_reconfigure_controller(struct bridge *br)
if (probe < 5) {
probe = cfg_get_int(0, "mgmt.inactivity-probe");
if (probe < 5) {
if (probe < 5) {
probe = cfg_get_int(0, "mgmt.inactivity-probe");
if (probe < 5) {
- probe =
1
5;
+ probe = 5;
}
}
ofproto_set_probe_interval(br->ofproto, probe);
}
}
ofproto_set_probe_interval(br->ofproto, probe);
@@
-1213,7
+1213,7
@@
bridge_reconfigure_controller(struct bridge *br)
if (!max_backoff) {
max_backoff = cfg_get_int(0, "mgmt.max-backoff");
if (!max_backoff) {
if (!max_backoff) {
max_backoff = cfg_get_int(0, "mgmt.max-backoff");
if (!max_backoff) {
- max_backoff =
15
;
+ max_backoff =
8
;
}
}
ofproto_set_max_backoff(br->ofproto, max_backoff);
}
}
ofproto_set_max_backoff(br->ofproto, max_backoff);