summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2024-04-08 12:35:54 +0200
committerDavid S. Miller <davem@davemloft.net>2024-04-08 12:35:54 +0200
commitcf234bac8358b3d5311b6af9743d701a3c1da08a (patch)
tree2da8e02ccf2a88789f42d6ae75642dbae2af5f4b /net
parentlib: checksum: hide unused expected_csum_ipv6_magic[] (diff)
parentbatman-adv: Avoid infinite loop trying to resize local TT (diff)
downloadlinux-cf234bac8358b3d5311b6af9743d701a3c1da08a.tar.xz
linux-cf234bac8358b3d5311b6af9743d701a3c1da08a.zip
Merge tag 'batadv-net-pullrequest-20240405' of git://git.open-mesh.org/linux-merge
Simon Wunderlich says: ==================== Here is a batman-adv bugfix: - void infinite loop trying to resize local TT, by Sven Eckelmann ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/batman-adv/translation-table.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c
index b95c36765d04..2243cec18ecc 100644
--- a/net/batman-adv/translation-table.c
+++ b/net/batman-adv/translation-table.c
@@ -3948,7 +3948,7 @@ void batadv_tt_local_resize_to_mtu(struct net_device *soft_iface)
spin_lock_bh(&bat_priv->tt.commit_lock);
- while (true) {
+ while (timeout) {
table_size = batadv_tt_local_table_transmit_size(bat_priv);
if (packet_size_max >= table_size)
break;