git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'mainstream'
[sliver-openvswitch.git]
/
lib
/
dpif.c
diff --git
a/lib/dpif.c
b/lib/dpif.c
index
1bac8e8
..
b338b33
100644
(file)
--- a/
lib/dpif.c
+++ b/
lib/dpif.c
@@
-1184,6
+1184,8
@@
dpif_execute__(struct dpif *dpif, const struct dpif_execute *execute)
* OVS_ACTION_ATTR_USERSPACE actions it passes the packet through to the dpif
* implementation.
*
* OVS_ACTION_ATTR_USERSPACE actions it passes the packet through to the dpif
* implementation.
*
+ * This works even if 'actions_len' is too long for a Netlink attribute.
+ *
* Returns 0 if successful, otherwise a positive errno value. */
int
dpif_execute(struct dpif *dpif,
* Returns 0 if successful, otherwise a positive errno value. */
int
dpif_execute(struct dpif *dpif,
@@
-1199,7
+1201,7
@@
dpif_execute(struct dpif *dpif,
execute.actions = actions;
execute.actions_len = actions_len;
execute.packet = buf;
execute.actions = actions;
execute.actions_len = actions_len;
execute.packet = buf;
- execute.needs_help = needs_help;
+ execute.needs_help = needs_help
|| nl_attr_oversized(actions_len)
;
return dpif_execute__(dpif, &execute);
}
return dpif_execute__(dpif, &execute);
}