diff options
| author | Simon Horman <horms@verge.net.au> | 2014-06-24 20:56:57 +0900 |
|---|---|---|
| committer | Jesse Gross <jesse@nicira.com> | 2014-06-24 16:02:02 -0700 |
| commit | ccf4378615e93618e6ab8423fa1400b40876df91 (patch) | |
| tree | db5350feb49bf3f0e8a2b114b5d6f72d8655f4f1 /datapath/datapath.c | |
| parent | b2f771efcabbd0b4e4c60d3126c45ba8b1c04e29 (diff) | |
| download | openvswitch-ccf4378615e93618e6ab8423fa1400b40876df91.tar.gz | |
datapath: 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>
Diffstat (limited to 'datapath/datapath.c')
| -rw-r--r-- | datapath/datapath.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/datapath/datapath.c b/datapath/datapath.c index 6f4236b41..4ec908e4b 100644 --- a/datapath/datapath.c +++ b/datapath/datapath.c @@ -382,7 +382,7 @@ static size_t key_attr_size(void) { /* Whenever adding new OVS_KEY_ FIELDS, we should consider * updating this function. */ - BUILD_BUG_ON(OVS_KEY_ATTR_TUNNEL_INFO != 21); + BUILD_BUG_ON(OVS_KEY_ATTR_TUNNEL_INFO != 22); return nla_total_size(4) /* OVS_KEY_ATTR_PRIORITY */ + nla_total_size(0) /* OVS_KEY_ATTR_TUNNEL */ @@ -586,7 +586,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); rcu_assign_pointer(flow->sf_acts, acts); if (err) goto err_flow_free; @@ -874,7 +874,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; @@ -978,7 +978,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); |