projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add Nicira vendor extension action NXAST_DEC_TTL_CNT_IDS.
[openvswitch]
/
lib
/
odp-util.c
diff --git
a/lib/odp-util.c
b/lib/odp-util.c
index 8693d3c81baf635d64b789ec20bd6ec85c0141e7..901dac3b4c80cba5649ff5a58af604632fde2127 100644
(file)
--- a/
lib/odp-util.c
+++ b/
lib/odp-util.c
@@
-14,8
+14,8
@@
* limitations under the License.
*/
* limitations under the License.
*/
-#include <arpa/inet.h>
#include <config.h>
#include <config.h>
+#include <arpa/inet.h>
#include "odp-util.h"
#include <errno.h>
#include <inttypes.h>
#include "odp-util.h"
#include <errno.h>
#include <inttypes.h>
@@
-1246,7
+1246,10
@@
ovs_to_odp_frag(uint8_t nw_frag)
: OVS_FRAG_TYPE_LATER);
}
: OVS_FRAG_TYPE_LATER);
}
-/* Appends a representation of 'flow' as OVS_KEY_ATTR_* attributes to 'buf'. */
+/* Appends a representation of 'flow' as OVS_KEY_ATTR_* attributes to 'buf'.
+ *
+ * 'buf' must have at least ODPUTIL_FLOW_KEY_BYTES bytes of space, or be
+ * capable of being expanded to allow for that much space. */
void
odp_flow_key_from_flow(struct ofpbuf *buf, const struct flow *flow)
{
void
odp_flow_key_from_flow(struct ofpbuf *buf, const struct flow *flow)
{
@@
-1973,7
+1976,7
@@
static void
commit_set_port_action(const struct flow *flow, struct flow *base,
struct ofpbuf *odp_actions)
{
commit_set_port_action(const struct flow *flow, struct flow *base,
struct ofpbuf *odp_actions)
{
- if (!base->tp_src
||
!base->tp_dst) {
+ if (!base->tp_src
&&
!base->tp_dst) {
return;
}
return;
}