datapath: Convert ODP_FLOW_* commands to use AF_NETLINK socket layer.

[sliver-openvswitch.git] / datapath / flow.c

diff --git a/datapath/flow.c b/datapath/flow.c
index 0987fd2..e90b36a 100644 (file)
--- a/datapath/flow.c
+++ b/datapath/flow.c
@@ -103,13 +103,11 @@ void flow_used(struct sw_flow *flow, struct sk_buff *skb)
        spin_unlock_bh(&flow->lock);
 }
 
-struct sw_flow_actions *flow_actions_alloc(u32 actions_len)
+struct sw_flow_actions *flow_actions_alloc(const struct nlattr *actions)
 {
+       int actions_len = nla_len(actions);
        struct sw_flow_actions *sfa;
 
-       if (actions_len % NLA_ALIGNTO)
-               return ERR_PTR(-EINVAL);
-
        /* At least DP_MAX_PORTS actions are required to be able to flood a
         * packet to every port.  Factor of 2 allows for setting VLAN tags,
         * etc. */
@@ -121,6 +119,7 @@ struct sw_flow_actions *flow_actions_alloc(u32 actions_len)
                return ERR_PTR(-ENOMEM);
 
        sfa->actions_len = actions_len;
+       memcpy(sfa->actions, nla_data(actions), actions_len);
        return sfa;
 }