netdev-dpdk: fix mbuf leaks

[cascardo/ovs.git] / lib / stream-tcp.c

diff --git a/lib/stream-tcp.c b/lib/stream-tcp.c
index e58c5ad..fc5a606 100644 (file)
--- a/lib/stream-tcp.c
+++ b/lib/stream-tcp.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, 2010, 2012, 2013, 2014 Nicira, Inc.
+ * Copyright (c) 2008, 2009, 2010, 2012, 2013, 2014, 2015 Nicira, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,7 +31,7 @@
 #include "util.h"
 #include "stream-provider.h"
 #include "stream-fd.h"
-#include "vlog.h"
+#include "openvswitch/vlog.h"
 
 VLOG_DEFINE_THIS_MODULE(stream_tcp);
 
@@ -76,6 +76,8 @@ const struct stream_class tcp_stream_class = {
 };
 
 #ifdef _WIN32
+#include "dirs.h"
+
 static int
 windows_open(const char *name, char *suffix, struct stream **streamp,
              uint8_t dscp)
@@ -161,8 +163,7 @@ new_pstream(char *suffix, const char *name, struct pstream **pstreamp,
         conn_name = bound_name;
     }
 
-    error = new_fd_pstream(conn_name, fd, ptcp_accept, set_dscp, unlink_path,
-                           pstreamp);
+    error = new_fd_pstream(conn_name, fd, ptcp_accept, unlink_path, pstreamp);
     if (!error) {
         pstream_set_bound_port(*pstreamp, htons(port));
     }
@@ -196,7 +197,6 @@ const struct pstream_class ptcp_pstream_class = {
     NULL,
     NULL,
     NULL,
-    NULL,
 };
 
 #ifdef _WIN32
@@ -253,6 +253,5 @@ const struct pstream_class pwindows_pstream_class = {
     NULL,
     NULL,
     NULL,
-    NULL,
 };
 #endif