diff options
| author | Alexei Starovoitov <ast@plumgrid.com> | 2015-08-05 07:51:07 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-08-07 20:46:34 +0200 |
| commit | da8b43c0e1dcea3bcac5f37ea59934ddaa137aed (patch) | |
| tree | c684b2430b72958a76885c1f6f21fc67c389c57d /net/openvswitch/vport-vxlan.c | |
| parent | Merge branch 'rds-tcp-netns' (diff) | |
| download | linux-da8b43c0e1dcea3bcac5f37ea59934ddaa137aed.tar.xz linux-da8b43c0e1dcea3bcac5f37ea59934ddaa137aed.zip | |
vxlan: combine VXLAN_FLOWBASED into VXLAN_COLLECT_METADATA
IFLA_VXLAN_FLOWBASED is useless without IFLA_VXLAN_COLLECT_METADATA,
so combine them into single IFLA_VXLAN_COLLECT_METADATA flag.
'flowbased' doesn't convey real meaning of the vxlan tunnel mode.
This mode can be used by routing, tc+bpf and ovs.
Only ovs is strictly flow based, so 'collect metadata' is a better
name for this tunnel mode.
Signed-off-by: Alexei Starovoitov <ast@plumgrid.com>
Acked-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/openvswitch/vport-vxlan.c')
| -rw-r--r-- | net/openvswitch/vport-vxlan.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/openvswitch/vport-vxlan.c b/net/openvswitch/vport-vxlan.c index 547173336cd3..c6e937e36f8b 100644 --- a/net/openvswitch/vport-vxlan.c +++ b/net/openvswitch/vport-vxlan.c @@ -90,7 +90,7 @@ static struct vport *vxlan_tnl_create(const struct vport_parms *parms) int err; struct vxlan_config conf = { .no_share = true, - .flags = VXLAN_F_FLOW_BASED | VXLAN_F_COLLECT_METADATA, + .flags = VXLAN_F_COLLECT_METADATA, }; if (!options) { |