diff options
Diffstat (limited to 'net/openvswitch/actions.c')
-rw-r--r-- | net/openvswitch/actions.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/openvswitch/actions.c b/net/openvswitch/actions.c index 8a1eb562cdec..1cdb539d05bd 100644 --- a/net/openvswitch/actions.c +++ b/net/openvswitch/actions.c | |||
@@ -510,7 +510,7 @@ static int execute_set_action(struct sk_buff *skb, | |||
510 | break; | 510 | break; |
511 | 511 | ||
512 | case OVS_KEY_ATTR_IPV4_TUNNEL: | 512 | case OVS_KEY_ATTR_IPV4_TUNNEL: |
513 | OVS_CB(skb)->tun_key = nla_data(nested_attr); | 513 | OVS_CB(skb)->egress_tun_key = nla_data(nested_attr); |
514 | break; | 514 | break; |
515 | 515 | ||
516 | case OVS_KEY_ATTR_ETHERNET: | 516 | case OVS_KEY_ATTR_ETHERNET: |
@@ -613,7 +613,6 @@ int ovs_execute_actions(struct datapath *dp, struct sk_buff *skb, | |||
613 | { | 613 | { |
614 | struct sw_flow_actions *acts = rcu_dereference(OVS_CB(skb)->flow->sf_acts); | 614 | struct sw_flow_actions *acts = rcu_dereference(OVS_CB(skb)->flow->sf_acts); |
615 | 615 | ||
616 | OVS_CB(skb)->tun_key = NULL; | ||
617 | return do_execute_actions(dp, skb, key, | 616 | return do_execute_actions(dp, skb, key, |
618 | acts->actions, acts->actions_len); | 617 | acts->actions, acts->actions_len); |
619 | } | 618 | } |