diff options
| author | David S. Miller <davem@davemloft.net> | 2018-11-09 06:49:32 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-11-09 06:49:32 +0300 |
| commit | eb4149c9a5dfaa310d70326434c686af66e3d10f (patch) | |
| tree | bc27ca1d9a8db3f2d610994d4336e029d2e66e09 /net/openvswitch/flow.c | |
| parent | 0d404a61286f2ffcde2157e8c5427f93f409d8ab (diff) | |
| parent | f4f9a5e6cc7341c6c74060ee5a594d395c364c6f (diff) | |
| download | linux-eb4149c9a5dfaa310d70326434c686af66e3d10f.tar.xz | |
Merge branch 'net-Remove-VLAN_TAG_PRESENT-from-drivers'
Michał Mirosław says:
====================
net: Remove VLAN_TAG_PRESENT from drivers
This series removes VLAN_TAG_PRESENT use from network drivers in
preparation to removing its special meaning.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
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 35966da84769..fa393815991e 100644 --- a/net/openvswitch/flow.c +++ b/net/openvswitch/flow.c @@ -325,7 +325,7 @@ static int parse_vlan_tag(struct sk_buff *skb, struct vlan_head *key_vh, return -ENOMEM; vh = (struct vlan_head *)skb->data; - key_vh->tci = vh->tci | htons(VLAN_TAG_PRESENT); + key_vh->tci = vh->tci | htons(VLAN_CFI_MASK); key_vh->tpid = vh->tpid; if (unlikely(untag_vlan)) { @@ -358,7 +358,7 @@ static int parse_vlan(struct sk_buff *skb, struct sw_flow_key *key) int res; if (skb_vlan_tag_present(skb)) { - key->eth.vlan.tci = htons(skb->vlan_tci); + key->eth.vlan.tci = htons(skb->vlan_tci) | htons(VLAN_CFI_MASK); key->eth.vlan.tpid = skb->vlan_proto; } else { /* Parse outer vlan tag in the non-accelerated case. */ |