]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
sd-netlink: always append new bridge FDB entries
authorYu Watanabe <watanabe.yu+github@gmail.com>
Wed, 4 Aug 2021 09:16:44 +0000 (18:16 +0900)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Wed, 4 Aug 2021 09:16:47 +0000 (18:16 +0900)
This partially reverts 192a9d95ea3e058afd824d38a9cea16ad0a84a57 (#19432).

Fixes #20305.

src/libsystemd/sd-netlink/rtnl-message.c

index a5a2f4424ffcfc92aba2163775a545e606c1af4f..9127167bb2224546135086698d429c84cd4b61ff 100644 (file)
@@ -443,8 +443,12 @@ int sd_rtnl_message_new_neigh(sd_netlink *rtnl, sd_netlink_message **ret, uint16
         if (r < 0)
                 return r;
 
-        if (nlmsg_type == RTM_NEWNEIGH)
-                (*ret)->hdr->nlmsg_flags |= NLM_F_CREATE | NLM_F_REPLACE;
+        if (nlmsg_type == RTM_NEWNEIGH) {
+                if (ndm_family == AF_BRIDGE)
+                        (*ret)->hdr->nlmsg_flags |= NLM_F_CREATE | NLM_F_APPEND;
+                else
+                        (*ret)->hdr->nlmsg_flags |= NLM_F_CREATE | NLM_F_REPLACE;
+        }
 
         ndm = NLMSG_DATA((*ret)->hdr);