diff options
Diffstat (limited to 'net/openvswitch/datapath.c')
-rw-r--r-- | net/openvswitch/datapath.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c index f18302f32049..688cb9bc0ef1 100644 --- a/net/openvswitch/datapath.c +++ b/net/openvswitch/datapath.c | |||
@@ -560,7 +560,7 @@ static int ovs_packet_cmd_execute(struct sk_buff *skb, struct genl_info *info) | |||
560 | goto err_flow_free; | 560 | goto err_flow_free; |
561 | 561 | ||
562 | err = ovs_nla_copy_actions(a[OVS_PACKET_ATTR_ACTIONS], | 562 | err = ovs_nla_copy_actions(a[OVS_PACKET_ATTR_ACTIONS], |
563 | &flow->key, 0, &acts); | 563 | &flow->key, &acts); |
564 | if (err) | 564 | if (err) |
565 | goto err_flow_free; | 565 | goto err_flow_free; |
566 | 566 | ||
@@ -846,7 +846,7 @@ static int ovs_flow_cmd_new(struct sk_buff *skb, struct genl_info *info) | |||
846 | goto err_kfree_flow; | 846 | goto err_kfree_flow; |
847 | 847 | ||
848 | error = ovs_nla_copy_actions(a[OVS_FLOW_ATTR_ACTIONS], &new_flow->key, | 848 | error = ovs_nla_copy_actions(a[OVS_FLOW_ATTR_ACTIONS], &new_flow->key, |
849 | 0, &acts); | 849 | &acts); |
850 | if (error) { | 850 | if (error) { |
851 | OVS_NLERR("Flow actions may not be safe on all matching packets.\n"); | 851 | OVS_NLERR("Flow actions may not be safe on all matching packets.\n"); |
852 | goto err_kfree_acts; | 852 | goto err_kfree_acts; |
@@ -953,7 +953,7 @@ static struct sw_flow_actions *get_flow_actions(const struct nlattr *a, | |||
953 | return acts; | 953 | return acts; |
954 | 954 | ||
955 | ovs_flow_mask_key(&masked_key, key, mask); | 955 | ovs_flow_mask_key(&masked_key, key, mask); |
956 | error = ovs_nla_copy_actions(a, &masked_key, 0, &acts); | 956 | error = ovs_nla_copy_actions(a, &masked_key, &acts); |
957 | if (error) { | 957 | if (error) { |
958 | OVS_NLERR("Flow actions may not be safe on all matching packets.\n"); | 958 | OVS_NLERR("Flow actions may not be safe on all matching packets.\n"); |
959 | kfree(acts); | 959 | kfree(acts); |