From: Yu Watanabe Date: Sat, 18 Dec 2021 01:06:59 +0000 (+0900) Subject: network: dhcp-pd: do not stack 6rd sit tunnel X-Git-Tag: v250-rc3~16^2~5 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fe87807eaa3a6af26c30e79a26140530eff4efcd;p=thirdparty%2Fsystemd.git network: dhcp-pd: do not stack 6rd sit tunnel --- diff --git a/src/network/netdev/tunnel.c b/src/network/netdev/tunnel.c index 59da4d4376c..97e534fe99e 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 a55ac4de7e4..151270b8a26 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)