projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add function get_null_fd(), to reduce code redundancy.
[openvswitch]
/
secchan
/
ofproto.c
diff --git
a/secchan/ofproto.c
b/secchan/ofproto.c
index aa9e44a1baef453773098260975f1687918c5f84..599a97892578c569369187bd85b6ff001bd03e9e 100644
(file)
--- a/
secchan/ofproto.c
+++ b/
secchan/ofproto.c
@@
-431,8
+431,9
@@
ofproto_set_in_band(struct ofproto *p, bool in_band)
{
if (in_band != (p->in_band != NULL)) {
if (in_band) {
{
if (in_band != (p->in_band != NULL)) {
if (in_band) {
- return in_band_create(p, &p->dpif, p->switch_status,
- p->controller->rconn, &p->in_band);
+ in_band_create(p, p->switch_status, p->controller->rconn,
+ &p->in_band);
+ return 0;
} else {
ofproto_set_discovery(p, false, NULL, true);
in_band_destroy(p->in_band);
} else {
ofproto_set_discovery(p, false, NULL, true);
in_band_destroy(p->in_band);
@@
-635,6
+636,12
@@
ofproto_get_datapath_id(const struct ofproto *ofproto)
return ofproto->datapath_id;
}
return ofproto->datapath_id;
}
+uint64_t
+ofproto_get_mgmt_id(const struct ofproto *ofproto)
+{
+ return ofproto->mgmt_id;
+}
+
int
ofproto_get_probe_interval(const struct ofproto *ofproto)
{
int
ofproto_get_probe_interval(const struct ofproto *ofproto)
{