The following commit has been merged in the batadv/net-next branch: commit 29398d970512ee0001d588ffa3753c087f25d956 Author: Sven Eckelmann sven@narfation.org Date: Thu Jul 27 10:13:42 2023 +0200

batman-adv: Avoid magic value for minimum MTU

The header linux/if_ether.h already defines a constant for the minimum MTU. So simply use it instead of having a magic constant in the code.

Signed-off-by: Sven Eckelmann sven@narfation.org Signed-off-by: Simon Wunderlich sw@simonwunderlich.de

diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index d3fdf82282af..f7947fad06f2 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@ -154,7 +154,7 @@ static int batadv_interface_set_mac_addr(struct net_device *dev, void *p) static int batadv_interface_change_mtu(struct net_device *dev, int new_mtu) { /* check ranges */ - if (new_mtu < 68 || new_mtu > batadv_hardif_min_mtu(dev)) + if (new_mtu < ETH_MIN_MTU || new_mtu > batadv_hardif_min_mtu(dev)) return -EINVAL;

dev->mtu = new_mtu;