network: dhcp-pd: do not stack 6rd sit tunnel

diff --git a/src/network/netdev/tunnel.c b/src/network/netdev/tunnel.c
index 59da4d4376c80d4eb8f1dca887d904e4de7f1887..97e534fe99ec39004a80e7fda731b3d7b2674c48 100644 (file)
--- 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 a55ac4de7e47bf0a62fd2701193a9bf4f9d4b593..151270b8a26823c996511f09d2c76a274ce223d2 100755 (executable)
--- 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)