This makes this code more obviously thread-safe.
Signed-off-by: Ben Pfaff <[email protected]>
---
lib/dpif-linux.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/lib/dpif-linux.c b/lib/dpif-linux.c
index b863a2e..2aa09ff 100644
--- a/lib/dpif-linux.c
+++ b/lib/dpif-linux.c
@@ -794,7 +794,7 @@ static void
dpif_linux_init_flow_put(struct dpif *dpif_, const struct dpif_flow_put *put,
struct dpif_linux_flow *request)
{
- static struct nlattr dummy_action;
+ static const struct nlattr dummy_action;
struct dpif_linux *dpif = dpif_linux_cast(dpif_);
@@ -805,7 +805,9 @@ dpif_linux_init_flow_put(struct dpif *dpif_, const struct
dpif_flow_put *put,
request->key = put->key;
request->key_len = put->key_len;
/* Ensure that OVS_FLOW_ATTR_ACTIONS will always be included. */
- request->actions = put->actions ? put->actions : &dummy_action;
+ request->actions = (put->actions
+ ? put->actions
+ : CONST_CAST(struct nlattr *, &dummy_action));
request->actions_len = put->actions_len;
if (put->flags & DPIF_FP_ZERO_STATS) {
request->clear = true;
--
1.7.2.5
_______________________________________________
dev mailing list
[email protected]
http://openvswitch.org/mailman/listinfo/dev
