From: Jakub Kicinski Date: Sun, 19 Jan 2025 01:57:31 +0000 (-0800) Subject: Merge tag 'batadv-next-pullrequest-20250117' of git://git.open-mesh.org/linux-merge X-Git-Tag: v6.14-rc1~162^2~18 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=59372af69d4d71e6487614f1b35712cf241eadb4;p=thirdparty%2Fkernel%2Flinux.git Merge tag 'batadv-next-pullrequest-20250117' of git://git.open-mesh.org/linux-merge Simon Wunderlich says: ==================== This cleanup patchset includes the following patches: - bump version strings, by Simon Wunderlich - Reorder includes for distributed-arp-table.c, by Sven Eckelmann - Fix translation table change handling, by Remi Pommarel (2 patches) - Map VID 0 to untagged TT VLAN, by Sven Eckelmann - Update MAINTAINERS/mailmap e-mail addresses, by the respective authors (4 patches) - netlink: reduce duplicate code by returning interfaces, by Linus Lüssing * tag 'batadv-next-pullrequest-20250117' of git://git.open-mesh.org/linux-merge: batman-adv: netlink: reduce duplicate code by returning interfaces MAINTAINERS: mailmap: add entries for Antonio Quartulli mailmap: add entries for Sven Eckelmann mailmap: add entries for Simon Wunderlich MAINTAINERS: update email address of Marek Linder batman-adv: Map VID 0 to untagged TT VLAN batman-adv: Don't keep redundant TT change events batman-adv: Remove atomic usage for tt.local_changes batman-adv: Reorder includes for distributed-arp-table.c batman-adv: Start new development cycle ==================== Link: https://patch.msgid.link/20250117123910.219278-1-sw@simonwunderlich.de Signed-off-by: Jakub Kicinski --- 59372af69d4d71e6487614f1b35712cf241eadb4 diff --cc net/batman-adv/translation-table.c index 760d51fdbdf60,2bc3407f38b29..3c0a14a582e4b --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@@ -948,11 -942,9 +942,11 @@@ static void batadv_tt_tvlv_container_up int tt_diff_len, tt_change_len = 0; int tt_diff_entries_num = 0; int tt_diff_entries_count = 0; + bool drop_changes = false; + size_t tt_extra_len = 0; u16 tvlv_len; - tt_diff_entries_num = atomic_read(&bat_priv->tt.local_changes); + tt_diff_entries_num = READ_ONCE(bat_priv->tt.local_changes); tt_diff_len = batadv_tt_len(tt_diff_entries_num); /* if we have too many changes for one packet don't send any