openvswitch: Add basic MPLS support to kernel

Allow datapath to recognize and extract MPLS labels into flow keys
and execute actions which push, pop, and set labels on packets.

Based heavily on work by Leo Alterman, Ravi K, Isaku Yamahata and Joe Stringer.

Cc: Ravi K <rkerur@gmail.com>
Cc: Leo Alterman <lalterman@nicira.com>
Cc: Isaku Yamahata <yamahata@valinux.co.jp>
Cc: Joe Stringer <joe@wand.net.nz>
Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: Jesse Gross <jesse@nicira.com>
Signed-off-by: Pravin B Shelar <pshelar@nicira.com>

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)
                 goto err_flow_free;
 
         err = ovs_nla_copy_actions(a[OVS_PACKET_ATTR_ACTIONS],
-                                   &flow->key, 0, &acts);
+                                   &flow->key, &acts);
         if (err)
                 goto err_flow_free;
 
@@ -846,7 +846,7 @@ static int ovs_flow_cmd_new(struct sk_buff *skb, struct genl_info *info)
                 goto err_kfree_flow;
 
         error = ovs_nla_copy_actions(a[OVS_FLOW_ATTR_ACTIONS], &new_flow->key,
-                                     0, &acts);
+                                     &acts);
         if (error) {
                 OVS_NLERR("Flow actions may not be safe on all matching packets.\n");
                 goto err_kfree_acts;
@@ -953,7 +953,7 @@ static struct sw_flow_actions *get_flow_actions(const struct nlattr *a,
                 return acts;
 
         ovs_flow_mask_key(&masked_key, key, mask);
-        error = ovs_nla_copy_actions(a, &masked_key, 0, &acts);
+        error = ovs_nla_copy_actions(a, &masked_key, &acts);
         if (error) {
                 OVS_NLERR("Flow actions may not be safe on all matching packets.\n");
                 kfree(acts);