]> www.infradead.org Git - users/hch/misc.git/commitdiff
Merge tag 'batadv-next-pullrequest-20250117' of git://git.open-mesh.org/linux-merge
authorJakub Kicinski <kuba@kernel.org>
Sun, 19 Jan 2025 01:57:31 +0000 (17:57 -0800)
committerJakub Kicinski <kuba@kernel.org>
Sun, 19 Jan 2025 01:57:31 +0000 (17:57 -0800)
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 <kuba@kernel.org>
1  2 
.mailmap
MAINTAINERS
net/batman-adv/translation-table.c

diff --cc .mailmap
Simple merge
diff --cc MAINTAINERS
Simple merge
index 760d51fdbdf6026ce8cf110de8a629d2badaa576,2bc3407f38b299656ab2ee196cc23b41919d4aaf..3c0a14a582e4b005ed6bb360a07bf5dd05063b17
@@@ -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