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.h | |
| 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.h')
| -rw-r--r-- | net/openvswitch/flow.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/openvswitch/flow.h b/net/openvswitch/flow.h index c670dd24b8b7..ba01fc4270bd 100644 --- a/net/openvswitch/flow.h +++ b/net/openvswitch/flow.h @@ -60,7 +60,7 @@ struct ovs_tunnel_info { struct vlan_head { __be16 tpid; /* Vlan type. Generally 802.1q or 802.1ad.*/ - __be16 tci; /* 0 if no VLAN, VLAN_TAG_PRESENT set otherwise. */ + __be16 tci; /* 0 if no VLAN, VLAN_CFI_MASK set otherwise. */ }; #define OVS_SW_FLOW_KEY_METADATA_SIZE \ |