diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2021-08-04 18:16:44 +0900 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2021-08-06 13:09:30 +0200 |
| commit | a840aa6badad00af70b1ffab7d8c5f78cbf0c982 (patch) | |
| tree | 2ac9708e7e3e02faf55caacb315d890da13c6d42 | |
| parent | b78ea348e8d05abf6a6e7f256c943958071d8706 (diff) | |
| download | systemd-246.16.tar.gz | |
sd-netlink: always append new bridge FDB entriesv246.16
This partially reverts 192a9d95ea3e058afd824d38a9cea16ad0a84a57 (#19432).
Fixes #20305.
(cherry picked from commit 74c1ab841fbad9d4f237c819577fcd1d46a072b6)
(cherry picked from commit 38388b95d71b7701922f90854ce568f74e11ed12)
(cherry picked from commit 2e12f3ad804f2ac5a220d3260fa6cf52a4684731)
(cherry picked from commit 9c78b82c6abe97e4e690b430136d98989ad32ba1)
| -rw-r--r-- | src/libsystemd/sd-netlink/rtnl-message.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/libsystemd/sd-netlink/rtnl-message.c b/src/libsystemd/sd-netlink/rtnl-message.c index 5e36b2ffdd..4a5faf9f8b 100644 --- a/src/libsystemd/sd-netlink/rtnl-message.c +++ b/src/libsystemd/sd-netlink/rtnl-message.c @@ -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); |