diff options
| author | Pravin B Shelar <pshelar@nicira.com> | 2013-06-17 17:50:12 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-06-19 18:07:41 -0700 |
| commit | 74f84a5726c7d08c27745305e67474b8645c541d (patch) | |
| tree | 4a51b650c961117b791418873527c296ae183af1 /net/openvswitch/flow.c | |
| parent | 9a628224a61bbcd2b50b3ec96e661fbbb49b619a (diff) | |
| download | linux-stable-74f84a5726c7d08c27745305e67474b8645c541d.tar.gz linux-stable-74f84a5726c7d08c27745305e67474b8645c541d.tar.bz2 linux-stable-74f84a5726c7d08c27745305e67474b8645c541d.zip | |
openvswitch: Copy individual actions.
Rather than validating actions and then copying all actiaons
in one block, following patch does same operation in single pass.
This validate and copy action one by one. This is required for
ovs tunneling patch.
This patch does not change any functionality.
Signed-off-by: Pravin B Shelar <pshelar@nicira.com>
Acked-by: Jesse Gross <jesse@nicira.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/openvswitch/flow.c')
| -rw-r--r-- | net/openvswitch/flow.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/net/openvswitch/flow.c b/net/openvswitch/flow.c index 093c191d4fc2..940d4b803ff5 100644 --- a/net/openvswitch/flow.c +++ b/net/openvswitch/flow.c @@ -198,20 +198,18 @@ void ovs_flow_used(struct sw_flow *flow, struct sk_buff *skb) spin_unlock(&flow->lock); } -struct sw_flow_actions *ovs_flow_actions_alloc(const struct nlattr *actions) +struct sw_flow_actions *ovs_flow_actions_alloc(int size) { - int actions_len = nla_len(actions); struct sw_flow_actions *sfa; - if (actions_len > MAX_ACTIONS_BUFSIZE) + if (size > MAX_ACTIONS_BUFSIZE) return ERR_PTR(-EINVAL); - sfa = kmalloc(sizeof(*sfa) + actions_len, GFP_KERNEL); + sfa = kmalloc(sizeof(*sfa) + size, GFP_KERNEL); if (!sfa) return ERR_PTR(-ENOMEM); - sfa->actions_len = actions_len; - nla_memcpy(sfa->actions, actions, actions_len); + sfa->actions_len = 0; return sfa; } |