diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2021-12-18 10:06:59 +0900 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2021-12-18 10:09:07 +0900 |
| commit | fe87807eaa3a6af26c30e79a26140530eff4efcd (patch) | |
| tree | 05e0af76a7598d9ac9ea36e4b071e30c61259207 | |
| parent | 42e7ce69e46aa50cf3615af0a5a1346ce0c51327 (diff) | |
| download | systemd-fe87807eaa3a6af26c30e79a26140530eff4efcd.tar.gz | |
network: dhcp-pd: do not stack 6rd sit tunnel
| -rw-r--r-- | src/network/netdev/tunnel.c | 4 | ||||
| -rwxr-xr-x | test/test-network/systemd-networkd-tests.py | 1 |
2 files changed, 0 insertions, 5 deletions
diff --git a/src/network/netdev/tunnel.c b/src/network/netdev/tunnel.c index 59da4d4376..97e534fe99 100644 --- a/src/network/netdev/tunnel.c +++ b/src/network/netdev/tunnel.c @@ -124,10 +124,6 @@ int dhcp4_pd_create_6rd_tunnel(Link *link, link_netlink_message_handler_t callba if (r < 0) return log_link_debug_errno(link, r, "Could not append IFLA_INFO_DATA attribute: %m"); - r = sd_netlink_message_append_u32(m, IFLA_IPTUN_LINK, link->ifindex); - if (r < 0) - return log_link_debug_errno(link, r, "Could not append IFLA_IPTUN_LINK attribute: %m"); - r = sd_netlink_message_append_in_addr(m, IFLA_IPTUN_LOCAL, &ipv4address); if (r < 0) return log_link_debug_errno(link, r, "Could not append IFLA_IPTUN_LOCAL attribute: %m"); diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py index a55ac4de7e..151270b8a2 100755 --- a/test/test-network/systemd-networkd-tests.py +++ b/test/test-network/systemd-networkd-tests.py @@ -5444,7 +5444,6 @@ class NetworkdDHCPPDTests(unittest.TestCase, Utilities): print(output) self.assertIn('link/sit 10.100.100.', output) self.assertIn('local 10.100.100.', output) - self.assertIn('dev veth99', output) self.assertIn('ttl 64', output) self.assertIn('6rd-prefix 2001:db8::/32', output) self.assertIn('6rd-relay_prefix 10.0.0.0/8', output) |