git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ofproto: Add support for OF1.3 port description multipart message.
[sliver-openvswitch.git]
/
lib
/
reconnect.c
diff --git
a/lib/reconnect.c
b/lib/reconnect.c
index
c750007
..
0333d96
100644
(file)
--- a/
lib/reconnect.c
+++ b/
lib/reconnect.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 2008, 2009, 2010 Nicira
Networks
.
+ * Copyright (c) 2008, 2009, 2010 Nicira
, Inc
.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-54,8
+54,6
@@
struct reconnect {
bool passive;
enum vlog_level info; /* Used for informational messages. */
bool passive;
enum vlog_level info; /* Used for informational messages. */
- uint8_t dscp;
-
/* State. */
enum state state;
long long int state_entered;
/* State. */
enum state state;
long long int state_entered;
@@
-188,14
+186,6
@@
reconnect_get_probe_interval(const struct reconnect *fsm)
return fsm->probe_interval;
}
return fsm->probe_interval;
}
-/* Returns the dscp value used for establishing the connection between the
- * manager and the database. */
-uint8_t
-reconnect_get_dscp(const struct reconnect *fsm)
-{
- return fsm->dscp;
-}
-
/* Limits the maximum number of times that 'fsm' will ask the client to try to
* reconnect to 'max_tries'. UINT_MAX (the default) means an unlimited number
* of tries.
/* Limits the maximum number of times that 'fsm' will ask the client to try to
* reconnect to 'max_tries'. UINT_MAX (the default) means an unlimited number
* of tries.
@@
-255,14
+245,6
@@
reconnect_set_probe_interval(struct reconnect *fsm, int probe_interval)
fsm->probe_interval = probe_interval ? MAX(1000, probe_interval) : 0;
}
fsm->probe_interval = probe_interval ? MAX(1000, probe_interval) : 0;
}
-/* Sets the dscp value to be used for establishing a connection between the
- * manager and the database. */
-void
-reconnect_set_dscp(struct reconnect *fsm, uint8_t dscp)
-{
- fsm->dscp = dscp;
-}
-
/* Returns true if 'fsm' is in passive mode, false if 'fsm' is in active mode
* (the default). */
bool
/* Returns true if 'fsm' is in passive mode, false if 'fsm' is in active mode
* (the default). */
bool