diff options
Diffstat (limited to 'net/openvswitch/actions.c')
-rw-r--r-- | net/openvswitch/actions.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/openvswitch/actions.c b/net/openvswitch/actions.c index 770064c83711..b4cffe686126 100644 --- a/net/openvswitch/actions.c +++ b/net/openvswitch/actions.c | |||
@@ -212,7 +212,7 @@ static int pop_vlan(struct sk_buff *skb, struct sw_flow_key *key) | |||
212 | int err; | 212 | int err; |
213 | 213 | ||
214 | err = skb_vlan_pop(skb); | 214 | err = skb_vlan_pop(skb); |
215 | if (vlan_tx_tag_present(skb)) | 215 | if (skb_vlan_tag_present(skb)) |
216 | invalidate_flow_key(key); | 216 | invalidate_flow_key(key); |
217 | else | 217 | else |
218 | key->eth.tci = 0; | 218 | key->eth.tci = 0; |
@@ -222,7 +222,7 @@ static int pop_vlan(struct sk_buff *skb, struct sw_flow_key *key) | |||
222 | static int push_vlan(struct sk_buff *skb, struct sw_flow_key *key, | 222 | static int push_vlan(struct sk_buff *skb, struct sw_flow_key *key, |
223 | const struct ovs_action_push_vlan *vlan) | 223 | const struct ovs_action_push_vlan *vlan) |
224 | { | 224 | { |
225 | if (vlan_tx_tag_present(skb)) | 225 | if (skb_vlan_tag_present(skb)) |
226 | invalidate_flow_key(key); | 226 | invalidate_flow_key(key); |
227 | else | 227 | else |
228 | key->eth.tci = vlan->vlan_tci; | 228 | key->eth.tci = vlan->vlan_tci; |