From d64e176c3521c5132c0d9afa5718d52b7465453a Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Tue, 23 Apr 2013 14:06:25 -0700 Subject: [PATCH] dpif-linux: Make dummy_action const in dpif_linux_init_flow_put(). This makes this code more obviously thread-safe. Signed-off-by: Ben Pfaff --- lib/dpif-linux.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/dpif-linux.c b/lib/dpif-linux.c index 933aabed1..ac20ae754 100644 --- a/lib/dpif-linux.c +++ b/lib/dpif-linux.c @@ -795,7 +795,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_); @@ -806,7 +806,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; -- 2.43.0