projects
/
cascardo
/
ovs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0a476db
)
dpif-linux: Fix bad backport in previous commit.
author
Ben Pfaff
<blp@nicira.com>
Tue, 15 Jul 2014 18:04:40 +0000
(11:04 -0700)
committer
Ben Pfaff
<blp@nicira.com>
Tue, 15 Jul 2014 18:11:33 +0000
(11:11 -0700)
Signed-off-by: Ben Pfaff <blp@nicira.com>
lib/dpif-linux.c
patch
|
blob
|
history
diff --git
a/lib/dpif-linux.c
b/lib/dpif-linux.c
index
5d88b41
..
41426bb
100644
(file)
--- a/
lib/dpif-linux.c
+++ b/
lib/dpif-linux.c
@@
-671,7
+671,7
@@
dpif_linux_port_get_pid(const struct dpif *dpif_, odp_port_t port_no)
uint32_t pid = 0;
ovs_mutex_lock(&dpif->upcall_lock);
- if (dpif->
handlers
&& dpif->uc_array_size > 0) {
+ if (dpif->
epoll_fd >= 0
&& dpif->uc_array_size > 0) {
/* The ODPP_NONE "reserved" port number uses the "ovs-system"'s
* channel, since it is not heavily loaded. */
uint32_t idx = port_idx >= dpif->uc_array_size ? 0 : port_idx;