diff options
author | William Tu <u9012063@gmail.com> | 2018-05-29 05:55:05 -0700 |
---|---|---|
committer | Ben Pfaff <blp@ovn.org> | 2018-05-29 16:24:17 -0700 |
commit | 6ba083c51e5f8d68f33d1b2c29c37c335465bc5c (patch) | |
tree | 7d1616bcc1cfec87d7151d8e0db919d354f304e0 /.travis.yml | |
parent | 2274109d5674f1f2b02de98a45acd8137f3df691 (diff) | |
download | openvswitch-6ba083c51e5f8d68f33d1b2c29c37c335465bc5c.tar.gz |
datapath: ip6_gre: fix tunnel metadata device sharing.
commit b80d0b93b991e551a32157e0d9d38fc5bc9348a7
Author: William Tu <u9012063@gmail.com>
Date: Fri May 18 19:22:28 2018 -0700
net: ip6_gre: fix tunnel metadata device sharing.
Currently ip6gre and ip6erspan share single metadata mode device,
using 'collect_md_tun'. Thus, when doing:
ip link add dev ip6gre11 type ip6gretap external
ip link add dev ip6erspan12 type ip6erspan external
RTNETLINK answers: File exists
simply fails due to the 2nd tries to create the same collect_md_tun.
The patch fixes it by adding a separate collect md tunnel device
for the ip6erspan, 'collect_md_tun_erspan'. As a result, a couple
of places need to refactor/split up in order to distinguish ip6gre
and ip6erspan.
First, move the collect_md check at ip6gre_tunnel_{unlink,link} and
create separate function {ip6gre,ip6ersapn}_tunnel_{link_md,unlink_md}.
Then before link/unlink, make sure the link_md/unlink_md is called.
Finally, a separate ndo_uninit is created for ip6erspan. Tested it
using the samples/bpf/test_tunnel_bpf.sh.
Fixes: ef7baf5e083c ("ip6_gre: add ip6 erspan collect_md mode")
Signed-off-by: William Tu <u9012063@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Cc: Greg Rose <gvrose8192@gmail.com>
Signed-off-by: William Tu <u9012063@gmail.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
Reviewed-by: Greg Rose <gvrose8192@gmail.com>
Tested-by: Greg Rose <gvrose8192@gmail.com>
Diffstat (limited to '.travis.yml')
0 files changed, 0 insertions, 0 deletions