diff options
Diffstat (limited to 'net/openvswitch/flow.c')
-rw-r--r-- | net/openvswitch/flow.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/openvswitch/flow.c b/net/openvswitch/flow.c index da2fae0873a5..df334fe43d7f 100644 --- a/net/openvswitch/flow.c +++ b/net/openvswitch/flow.c | |||
@@ -70,7 +70,7 @@ void ovs_flow_stats_update(struct sw_flow *flow, __be16 tcp_flags, | |||
70 | { | 70 | { |
71 | struct flow_stats *stats; | 71 | struct flow_stats *stats; |
72 | int node = numa_node_id(); | 72 | int node = numa_node_id(); |
73 | int len = skb->len + (vlan_tx_tag_present(skb) ? VLAN_HLEN : 0); | 73 | int len = skb->len + (skb_vlan_tag_present(skb) ? VLAN_HLEN : 0); |
74 | 74 | ||
75 | stats = rcu_dereference(flow->stats[node]); | 75 | stats = rcu_dereference(flow->stats[node]); |
76 | 76 | ||
@@ -472,7 +472,7 @@ static int key_extract(struct sk_buff *skb, struct sw_flow_key *key) | |||
472 | */ | 472 | */ |
473 | 473 | ||
474 | key->eth.tci = 0; | 474 | key->eth.tci = 0; |
475 | if (vlan_tx_tag_present(skb)) | 475 | if (skb_vlan_tag_present(skb)) |
476 | key->eth.tci = htons(skb->vlan_tci); | 476 | key->eth.tci = htons(skb->vlan_tci); |
477 | else if (eth->h_proto == htons(ETH_P_8021Q)) | 477 | else if (eth->h_proto == htons(ETH_P_8021Q)) |
478 | if (unlikely(parse_vlan(skb, key))) | 478 | if (unlikely(parse_vlan(skb, key))) |