Skip to content

pull request: batman-adv 2026-06-19

Simon Wunderlich batman netdev 1 version Applied

Status from this message: This series was applied to netdev/net.git (main)

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest15 patches 0 repliesApplied 15/15

Patches in v1 All 15 applied

#Subject and filesSizeRepliesApplied
1/15batman-adv: gw: don't deselect gateway with active hardifnet/batman-adv/hard-interface.c+2 -260 repliesApplied
2/15batman-adv: ensure bcast is writable before modifying TTLnet/batman-adv/routing.c+6 -00 repliesApplied
3/15batman-adv: fix (m|b)cast csum after decrementing TTLnet/batman-adv/routing.c+56 -20 repliesApplied
4/15batman-adv: frag: ensure fragment is writable before modifying TTLnet/batman-adv/fragmentation.c net/batman-adv/fragmentation.h net/batman-adv/routing.c+17 -40 repliesApplied
5/15batman-adv: frag: avoid underflow of TTLnet/batman-adv/fragmentation.c+7 -00 repliesApplied
6/15batman-adv: v: prevent OGM aggregation on disabled hardifnet/batman-adv/bat_v.c net/batman-adv/bat_v_ogm.c net/batman-adv/types.h+19 -00 repliesApplied
7/15batman-adv: tp_meter: restrict number of unacked list entriesnet/batman-adv/tp_meter.c net/batman-adv/types.h+25 -10 repliesApplied
8/15batman-adv: tp_meter: annotate last_recv_time access with READ/WRITE_ONCEnet/batman-adv/tp_meter.c+4 -40 repliesApplied
9/15batman-adv: tp_meter: prevent parallel modifications of last_recvnet/batman-adv/tp_meter.c net/batman-adv/types.h+14 -100 repliesApplied
10/15batman-adv: tp_meter: handle overlapping packetsnet/batman-adv/tp_meter.c+11 -140 repliesApplied
11/15batman-adv: tt: don't merge change entries with different VIDsnet/batman-adv/translation-table.c+3 -00 repliesApplied
12/15batman-adv: tt: track roam count per VIDnet/batman-adv/translation-table.c net/batman-adv/types.h+10 -20 repliesApplied
13/15batman-adv: dat: prevent false sharing between VLANsnet/batman-adv/distributed-arp-table.c+9 -30 repliesApplied
14/15batman-adv: tvlv: enforce 2-byte alignmentnet/batman-adv/bat_iv_ogm.c net/batman-adv/bat_v_ogm.c net/batman-adv/routing.c +1 more+32 -20 repliesApplied
15/15batman-adv: tvlv: avoid race of cifsnotfound handler statenet/batman-adv/tvlv.c net/batman-adv/types.h+57 -130 repliesApplied

Reviews trailers per patch

1 of 15 patches has a Reviewed-by or Acked-by.

PatchNora Schiffer
1/15R-b
2/15
3/15
4/15
5/15
6/15
7/15
8/15
9/15
10/15
11/15
12/15
13/15
14/15
15/15

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v1 thread

Cover letter [PATCH net 00/15] pull request: batman-adv 2026-06-19

Dear net maintainers,

here are some bugfixes for batman-adv which we would like to have integrated into net.

Please pull or let me know of any problem!

Thank you,
Simon

The following changes since commit dad4d4b92a9b9f0edb8c66deda049da1b62f6089:

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net (2026-06-11 14:33:35 -0700)

are available in the Git repository at:

https://git.open-mesh.org/batadv.git tags/batadv-net-pullrequest-20260619

for you to fetch changes up to edb557b2ba38fea2c5eb710cf366c797e187218c:

batman-adv: tvlv: avoid race of cifsnotfound handler state (2026-06-14 12:33:18 +0200)

----------------------------------------------------------------
Here are some batman-adv bugfixes, all by Sven Eckelmann:

- gw: don't deselect gateway with active hardif

- TTL fixes in bcast/mcast and fragmentation handling (4 patches)

- BATMAN V: prevent OGM aggregation on disabled hardif

- tp_meter: concurrency and range fixes, add cap to unacked list (4 patches)

- tt: fix unchecked VLAN ID in tt for local add and roam (2 patches)

- dat: check VLAN ID in the hash

- tvlv: enforce 2-byte alignment

- tvlv: avoid race of cifsnotfound handler state

----------------------------------------------------------------
Sven Eckelmann (15):
batman-adv: gw: don't deselect gateway with active hardif
batman-adv: ensure bcast is writable before modifying TTL
batman-adv: fix (m|b)cast csum after decrementing TTL
batman-adv: frag: ensure fragment is writable before modifying TTL
batman-adv: frag: avoid underflow of TTL
batman-adv: v: prevent OGM aggregation on disabled hardif
batman-adv: tp_meter: restrict number of unacked list entries
batman-adv: tp_meter: annotate last_recv_time access with READ/WRITE_ONCE
batman-adv: tp_meter: prevent parallel modifications of last_recv
batman-adv: tp_meter: handle overlapping packets
batman-adv: tt: don't merge change entries with different VIDs
batman-adv: tt: track roam count per VID
batman-adv: dat: prevent false sharing between VLANs
batman-adv: tvlv: enforce 2-byte alignment
batman-adv: tvlv: avoid race of cifsnotfound handler state

 net/batman-adv/bat_iv_ogm.c            | 11 ++++-
 net/batman-adv/bat_v.c                 |  1 +
 net/batman-adv/bat_v_ogm.c             | 23 ++++++++++-
 net/batman-adv/distributed-arp-table.c | 12 ++++--
 net/batman-adv/fragmentation.c         | 22 +++++++++-
 net/batman-adv/fragmentation.h         |  3 +-
 net/batman-adv/hard-interface.c        | 28 +------------
 net/batman-adv/routing.c               | 73 +++++++++++++++++++++++++++++++--
 net/batman-adv/tp_meter.c              | 74 ++++++++++++++++++++++------------
 net/batman-adv/translation-table.c     | 12 +++++-
 net/batman-adv/tvlv.c                  | 69 ++++++++++++++++++++++++++++---
 net/batman-adv/types.h                 | 21 ++++++----
 12 files changed, 270 insertions(+), 79 deletions(-)