projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Increase the default priority of vswitchd and brcompatd
[openvswitch]
/
lib
/
vconn-stream.c
diff --git
a/lib/vconn-stream.c
b/lib/vconn-stream.c
index 46279e57ea03ab0a5bf79075e2e1f8235f9cf02f..6d3825518b76690720bfb84a6654029b7c0e15df 100644
(file)
--- a/
lib/vconn-stream.c
+++ b/
lib/vconn-stream.c
@@
-41,7
+41,6
@@
struct stream_vconn
{
struct vconn vconn;
int fd;
{
struct vconn vconn;
int fd;
- void (*connect_success_cb)(struct vconn *, int);
struct ofpbuf *rxbuf;
struct ofpbuf *txbuf;
struct poll_waiter *tx_waiter;
struct ofpbuf *rxbuf;
struct ofpbuf *txbuf;
struct poll_waiter *tx_waiter;
@@
-55,21
+54,17
@@
static void stream_clear_txbuf(struct stream_vconn *);
int
new_stream_vconn(const char *name, int fd, int connect_status,
int
new_stream_vconn(const char *name, int fd, int connect_status,
- uint32_t remote_ip, uint16_t remote_port,
- bool reconnectable,
- connect_success_cb_func *connect_success_cb,
- struct vconn **vconnp)
+ bool reconnectable, struct vconn **vconnp)
{
struct stream_vconn *s;
s = xmalloc(sizeof *s);
{
struct stream_vconn *s;
s = xmalloc(sizeof *s);
- vconn_init(&s->vconn, &stream_vconn_class, connect_status,
remote_ip,
-
remote_port,
name, reconnectable);
+ vconn_init(&s->vconn, &stream_vconn_class, connect_status,
+ name, reconnectable);
s->fd = fd;
s->txbuf = NULL;
s->tx_waiter = NULL;
s->rxbuf = NULL;
s->fd = fd;
s->txbuf = NULL;
s->tx_waiter = NULL;
s->rxbuf = NULL;
- s->connect_success_cb = connect_success_cb;
*vconnp = &s->vconn;
return 0;
}
*vconnp = &s->vconn;
return 0;
}
@@
-96,14
+91,7
@@
static int
stream_connect(struct vconn *vconn)
{
struct stream_vconn *s = stream_vconn_cast(vconn);
stream_connect(struct vconn *vconn)
{
struct stream_vconn *s = stream_vconn_cast(vconn);
- int retval = check_connection_completion(s->fd);
- if (retval) {
- return retval;
- }
- if (s->connect_success_cb) {
- s->connect_success_cb(vconn, s->fd);
- }
- return 0;
+ return check_connection_completion(s->fd);
}
static int
}
static int