diff options
Diffstat (limited to 'net/openvswitch/datapath.c')
-rw-r--r-- | net/openvswitch/datapath.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c index 7b1d6d2b0c1a..f996db343247 100644 --- a/net/openvswitch/datapath.c +++ b/net/openvswitch/datapath.c | |||
@@ -482,6 +482,7 @@ static int validate_set(const struct nlattr *a, | |||
482 | const struct ovs_key_ipv6 *ipv6_key; | 482 | const struct ovs_key_ipv6 *ipv6_key; |
483 | 483 | ||
484 | case OVS_KEY_ATTR_PRIORITY: | 484 | case OVS_KEY_ATTR_PRIORITY: |
485 | case OVS_KEY_ATTR_SKB_MARK: | ||
485 | case OVS_KEY_ATTR_ETHERNET: | 486 | case OVS_KEY_ATTR_ETHERNET: |
486 | break; | 487 | break; |
487 | 488 | ||
@@ -695,6 +696,7 @@ static int ovs_packet_cmd_execute(struct sk_buff *skb, struct genl_info *info) | |||
695 | goto err_flow_free; | 696 | goto err_flow_free; |
696 | 697 | ||
697 | err = ovs_flow_metadata_from_nlattrs(&flow->key.phy.priority, | 698 | err = ovs_flow_metadata_from_nlattrs(&flow->key.phy.priority, |
699 | &flow->key.phy.skb_mark, | ||
698 | &flow->key.phy.in_port, | 700 | &flow->key.phy.in_port, |
699 | a[OVS_PACKET_ATTR_KEY]); | 701 | a[OVS_PACKET_ATTR_KEY]); |
700 | if (err) | 702 | if (err) |
@@ -714,6 +716,7 @@ static int ovs_packet_cmd_execute(struct sk_buff *skb, struct genl_info *info) | |||
714 | 716 | ||
715 | OVS_CB(packet)->flow = flow; | 717 | OVS_CB(packet)->flow = flow; |
716 | packet->priority = flow->key.phy.priority; | 718 | packet->priority = flow->key.phy.priority; |
719 | packet->mark = flow->key.phy.skb_mark; | ||
717 | 720 | ||
718 | rcu_read_lock(); | 721 | rcu_read_lock(); |
719 | dp = get_dp(sock_net(skb->sk), ovs_header->dp_ifindex); | 722 | dp = get_dp(sock_net(skb->sk), ovs_header->dp_ifindex); |