openvswitch: Make tunnel set action attach a metadata dst

Utilize the new metadata dst to attach encapsulation instructions to
the skb. The existing egress_tun_info via the OVS_CB() is left in
place until all tunnel vports have been converted to the new method.

Signed-off-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: Pravin B Shelar <pshelar@nicira.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 4 insertions, 4 deletions

diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c
index ff8c4a4c1609..02082107c74c 100644
--- a/net/openvswitch/datapath.c
+++ b/net/openvswitch/datapath.c
@@ -1018,7 +1018,7 @@ static int ovs_flow_cmd_new(struct sk_buff *skb, struct genl_info *info)
                 }
                 ovs_unlock();
 
-                ovs_nla_free_flow_actions(old_acts);
+                ovs_nla_free_flow_actions_rcu(old_acts);
                 ovs_flow_free(new_flow, false);
         }
 
@@ -1030,7 +1030,7 @@ err_unlock_ovs:
         ovs_unlock();
         kfree_skb(reply);
 err_kfree_acts:
-        kfree(acts);
+        ovs_nla_free_flow_actions(acts);
 err_kfree_flow:
         ovs_flow_free(new_flow, false);
 error:
@@ -1157,7 +1157,7 @@ static int ovs_flow_cmd_set(struct sk_buff *skb, struct genl_info *info)
         if (reply)
                 ovs_notify(&dp_flow_genl_family, reply, info);
         if (old_acts)
-                ovs_nla_free_flow_actions(old_acts);
+                ovs_nla_free_flow_actions_rcu(old_acts);
 
         return 0;
 
@@ -1165,7 +1165,7 @@ err_unlock_ovs:
         ovs_unlock();
         kfree_skb(reply);
 err_kfree_acts:
-        kfree(acts);
+        ovs_nla_free_flow_actions(acts);
 error:
         return error;
 }