Repository : ssh://git@diktynna/batman-adv On branches: main,main

commit b6d2c16d1a5f90e1aff1ca55d73ba4e7be03c2a0 Author: Alexander Lobakin aleksander.lobakin@intel.com Date: Thu Aug 29 14:33:37 2024 +0200

batman-adv: convert NETIF_F_LLTX to dev->lltx

NETIF_F_LLTX can't be changed via Ethtool and is not a feature, rather an attribute, very similar to IFF_NO_QUEUE (and hot). Free one netdev_features_t bit and make it a "hot" private flag.

Signed-off-by: Alexander Lobakin aleksander.lobakin@intel.com Signed-off-by: Paolo Abeni pabeni@redhat.com [sven@narfation.org: add compat code] Signed-off-by: Sven Eckelmann sven@narfation.org

b6d2c16d1a5f90e1aff1ca55d73ba4e7be03c2a0 net/batman-adv/soft-interface.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index 30ecbc2e..48cf3bd9 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@ -1021,8 +1021,12 @@ static void batadv_softif_init_early(struct net_device *dev) dev->needs_free_netdev = true; dev->priv_destructor = batadv_softif_free; dev->features |= NETIF_F_HW_VLAN_CTAG_FILTER | NETIF_F_NETNS_LOCAL; - dev->features |= NETIF_F_LLTX; dev->priv_flags |= IFF_NO_QUEUE; +#if LINUX_VERSION_IS_GEQ(6, 12, 0) // UGLY_HACK_NEW + dev->lltx = true; +#else // UGLY_HACK_OLD + dev->features |= NETIF_F_LLTX; +#endif // UGLY_HACK_STOP

/* can't call min_mtu, because the needed variables * have not been initialized yet