diff options
author | Ben Pfaff <blp@nicira.com> | 2009-12-02 11:49:53 -0800 |
---|---|---|
committer | Ben Pfaff <blp@nicira.com> | 2009-12-02 11:49:53 -0800 |
commit | 58fda1dab104041fc693032475ec4662c1a52849 (patch) | |
tree | c6adcb818ad9233155d4d65872e8144dae6fe723 /lib/stream-tcp.c | |
parent | c3bb4bd7f1d9c045a5e5d7062b09d4dac4e48195 (diff) | |
parent | 6c88d577e83db12f73df12be8fc575419b011fda (diff) | |
download | openvswitch-58fda1dab104041fc693032475ec4662c1a52849.tar.gz |
Merge "master" branch into "db".
Diffstat (limited to 'lib/stream-tcp.c')
-rw-r--r-- | lib/stream-tcp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/stream-tcp.c b/lib/stream-tcp.c index ecd96865f..947be9f19 100644 --- a/lib/stream-tcp.c +++ b/lib/stream-tcp.c @@ -74,7 +74,7 @@ tcp_open(const char *name, char *suffix, struct stream **streamp) struct sockaddr_in sin; int fd, error; - error = tcp_open_active(suffix, 0, &sin, &fd); + error = inet_open_active(SOCK_STREAM, suffix, 0, &sin, &fd); if (fd >= 0) { return new_tcp_stream(name, fd, error, &sin, streamp); } else { @@ -103,7 +103,7 @@ ptcp_open(const char *name UNUSED, char *suffix, struct pstream **pstreamp) { int fd; - fd = tcp_open_passive(suffix, 0); + fd = inet_open_passive(SOCK_STREAM, suffix, 0); if (fd < 0) { return -fd; } else { |