commits

commits@lists.open-mesh.org

1 participants
12395 discussions

[batman-adv] master: batman-adv: Drop initialization of flexible ethtool_link_ksettings (d5f557f1)
by postmaster＠open-mesh.org 20 Aug '22

20 Aug '22

Repository : ssh://git@diktynna/batman-adv On branch : master >--------------------------------------------------------------- commit d5f557f18adc031678ffe6f65cd5c3e859e0829b Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat Aug 20 09:32:50 2022 +0200 batman-adv: Drop initialization of flexible ethtool_link_ksettings The commit 94dfc73e7cf4 ("treewide: uapi: Replace zero-length arrays with flexible-array members") changed various structures from using 0-length arrays to flexible arrays net/batman-adv/bat_v_elp.c: note: in included file: ./include/linux/ethtool.h:148:38: warning: nested flexible array net/batman-adv/bat_v_elp.c:128:9: warning: using sizeof on a flexible structure In theory, this could be worked around by using {} as initializer for the variable on the stack. But this variable doesn't has to be initialized at all by the caller - everything will be initialized by the callee when no error occurs. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- d5f557f18adc031678ffe6f65cd5c3e859e0829b net/batman-adv/bat_v_elp.c | 1 - 1 file changed, 1 deletion(-) diff --git a/net/batman-adv/bat_v_elp.c b/net/batman-adv/bat_v_elp.c index b6db999a..f1741fbf 100644 --- a/net/batman-adv/bat_v_elp.c +++ b/net/batman-adv/bat_v_elp.c @@ -125,7 +125,6 @@ static u32 batadv_v_elp_get_throughput(struct batadv_hardif_neigh_node *neigh) /* if not a wifi interface, check if this device provides data via * ethtool (e.g. an Ethernet adapter) */ - memset(&link_settings, 0, sizeof(link_settings)); rtnl_lock(); ret = __ethtool_get_link_ksettings(hard_iface->net_dev, &link_settings); rtnl_unlock();

1 0

[batman-adv] maint's head updated: batman-adv: Add missing header for EINVAL (0df13e89)
by postmaster＠open-mesh.org 20 Aug '22

20 Aug '22

Repository : ssh://git@diktynna/batman-adv Branch 'maint' now includes: 0df13e89 batman-adv: Add missing header for EINVAL

1 0

[batman-adv] master: batman-adv: Add missing header for EINVAL (0df13e89)
by postmaster＠open-mesh.org 20 Aug '22

20 Aug '22

Repository : ssh://git@diktynna/batman-adv On branch : master >--------------------------------------------------------------- commit 0df13e8921c108a4233269fd491cc2a91c3dd281 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat Aug 20 13:27:36 2022 +0200 batman-adv: Add missing header for EINVAL Fixes: a124b52ebab9 ("batman-adv: Fix hang up with small MTU hard-interface") Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 0df13e8921c108a4233269fd491cc2a91c3dd281 net/batman-adv/hard-interface.c | 1 + 1 file changed, 1 insertion(+) diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c index dce55578..41c1ad33 100644 --- a/net/batman-adv/hard-interface.c +++ b/net/batman-adv/hard-interface.c @@ -10,6 +10,7 @@ #include <linux/atomic.h> #include <linux/byteorder/generic.h> #include <linux/container_of.h> +#include <linux/errno.h> #include <linux/gfp.h> #include <linux/if.h> #include <linux/if_arp.h>

1 0

[batman-adv] master: Merge branch 'maint' (8e24e49c)
by postmaster＠open-mesh.org 20 Aug '22

20 Aug '22

Repository : ssh://git@diktynna/batman-adv On branch : master >--------------------------------------------------------------- commit 8e24e49c9e610c98b7d25fa352a560e41065cf9f Merge: 4a329f32 0df13e89 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat Aug 20 14:19:44 2022 +0200 Merge branch 'maint' >--------------------------------------------------------------- 8e24e49c9e610c98b7d25fa352a560e41065cf9f compat-include/uapi/linux/if_ether.h | 25 +++++++++++++++++++++++++ net/batman-adv/hard-interface.c | 4 ++++ 2 files changed, 29 insertions(+)

1 0

[batman-adv] maint's head updated: batman-adv: compat: Add support for ETH_MIN_MTU (d20b3e39)
by postmaster＠open-mesh.org 20 Aug '22

20 Aug '22

Repository : ssh://git@diktynna/batman-adv Branch 'maint' now includes: d20b3e39 batman-adv: compat: Add support for ETH_MIN_MTU

1 0

[batman-adv] master: batman-adv: compat: Add support for ETH_MIN_MTU (d20b3e39)
by postmaster＠open-mesh.org 20 Aug '22

20 Aug '22

Repository : ssh://git@diktynna/batman-adv On branch : master >--------------------------------------------------------------- commit d20b3e396ec1f838e7e51f2de2329f43d4b92271 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat Aug 20 13:27:36 2022 +0200 batman-adv: compat: Add support for ETH_MIN_MTU Fixes: a124b52ebab9 ("batman-adv: Fix hang up with small MTU hard-interface") Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- d20b3e396ec1f838e7e51f2de2329f43d4b92271 compat-include/uapi/linux/if_ether.h | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/compat-include/uapi/linux/if_ether.h b/compat-include/uapi/linux/if_ether.h new file mode 100644 index 00000000..a23fa4d8 --- /dev/null +++ b/compat-include/uapi/linux/if_ether.h @@ -0,0 +1,25 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* Copyright (C) B.A.T.M.A.N. contributors: + * + * Marek Lindner, Simon Wunderlich + * + * This file contains macros for maintaining compatibility with older versions + * of the Linux kernel. + */ + +#ifndef _NET_BATMAN_ADV_COMPAT_UAPI_LINUX_IF_ETHER_H_ +#define _NET_BATMAN_ADV_COMPAT_UAPI_LINUX_IF_ETHER_H_ + +#include <linux/version.h> +#include_next <uapi/linux/if_ether.h> + + +#if LINUX_VERSION_IS_LESS(4, 10, 0) + +#ifndef ETH_MIN_MTU +#define ETH_MIN_MTU 68 +#endif + +#endif /* LINUX_VERSION_IS_LESS(4, 10, 0) */ + +#endif /* _NET_BATMAN_ADV_COMPAT_UAPI_LINUX_IF_ETHER_H_ */

1 0

[batman-adv] master: Merge branch 'maint' (91c66bc7)
by postmaster＠open-mesh.org 20 Aug '22

20 Aug '22

Repository : ssh://git@diktynna/batman-adv On branch : master >--------------------------------------------------------------- commit 91c66bc7b37cb17d7f22e9cd8f2f56371114db5f Merge: efd404cc d20b3e39 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat Aug 20 13:28:18 2022 +0200 Merge branch 'maint' >--------------------------------------------------------------- 91c66bc7b37cb17d7f22e9cd8f2f56371114db5f compat-include/uapi/linux/if_ether.h | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+)

1 0

[batman-adv] master: batman-adv: Drop initialization of flexible ethtool_link_ksettings (efd404cc)
by postmaster＠open-mesh.org 20 Aug '22

20 Aug '22

Repository : ssh://git@diktynna/batman-adv On branch : master >--------------------------------------------------------------- commit efd404cc8efb51a38231f54b63e0c6547722ba55 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat Aug 20 09:32:50 2022 +0200 batman-adv: Drop initialization of flexible ethtool_link_ksettings The commit 94dfc73e7cf4 ("treewide: uapi: Replace zero-length arrays with flexible-array members") changed various structures from using 0-length arrays to flexible arrays net/batman-adv/bat_v_elp.c: note: in included file: ./include/linux/ethtool.h:148:38: warning: nested flexible array net/batman-adv/bat_v_elp.c:128:9: warning: using sizeof on a flexible structure In theory, this could be worked around by using {} as initializer for the variable on the stack. But this variable doesn't has to be initialized at all by the caller - everything will be initialized by the callee when no error occurs. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- efd404cc8efb51a38231f54b63e0c6547722ba55 net/batman-adv/bat_v_elp.c | 1 - 1 file changed, 1 deletion(-) diff --git a/net/batman-adv/bat_v_elp.c b/net/batman-adv/bat_v_elp.c index b6db999a..f1741fbf 100644 --- a/net/batman-adv/bat_v_elp.c +++ b/net/batman-adv/bat_v_elp.c @@ -125,7 +125,6 @@ static u32 batadv_v_elp_get_throughput(struct batadv_hardif_neigh_node *neigh) /* if not a wifi interface, check if this device provides data via * ethtool (e.g. an Ethernet adapter) */ - memset(&link_settings, 0, sizeof(link_settings)); rtnl_lock(); ret = __ethtool_get_link_ksettings(hard_iface->net_dev, &link_settings); rtnl_unlock();

1 0

[batman-adv] maint's head updated: batman-adv: Fix hang up with small MTU hard-interface (a124b52e)
by postmaster＠open-mesh.org 20 Aug '22

20 Aug '22

Repository : ssh://git@diktynna/batman-adv Branch 'maint' now includes: a124b52e batman-adv: Fix hang up with small MTU hard-interface

1 0

[batman-adv] master: batman-adv: Fix hang up with small MTU hard-interface (a124b52e)
by postmaster＠open-mesh.org 20 Aug '22

20 Aug '22

Repository : ssh://git@diktynna/batman-adv On branch : master >--------------------------------------------------------------- commit a124b52ebab91ac416cf7ba05e671cbb860f30e8 Author: Shigeru Yoshida <syoshida(a)redhat.com> Date: Sat Aug 20 12:25:16 2022 +0900 batman-adv: Fix hang up with small MTU hard-interface The system hangs up when batman-adv soft-interface is created on hard-interface with small MTU. For example, the following commands create batman-adv soft-interface on dummy interface with zero MTU: # ip link add name dummy0 type dummy # ip link set mtu 0 dev dummy0 # ip link set up dev dummy0 # ip link add name bat0 type batadv # ip link set dev dummy0 master bat0 These commands cause the system hang up with the following messages: [ 90.578925][ T6689] batman_adv: bat0: Adding interface: dummy0 [ 90.580884][ T6689] batman_adv: bat0: The MTU of interface dummy0 is too small (0) to handle the transport of batman-adv packets. Packets going over this interface will be fragmented on layer2 which could impact the performance. Setting the MTU to 1560 would solve the problem. [ 90.586264][ T6689] batman_adv: bat0: Interface activated: dummy0 [ 90.590061][ T6689] batman_adv: bat0: Forced to purge local tt entries to fit new maximum fragment MTU (-320) [ 90.595517][ T6689] batman_adv: bat0: Forced to purge local tt entries to fit new maximum fragment MTU (-320) [ 90.598499][ T6689] batman_adv: bat0: Forced to purge local tt entries to fit new maximum fragment MTU (-320) This patch fixes this issue by returning error when enabling hard-interface with small MTU size. Fixes: 29a2a3dc52f4 ("hard interface rewrite") Signed-off-by: Shigeru Yoshida <syoshida(a)redhat.com> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- a124b52ebab91ac416cf7ba05e671cbb860f30e8 net/batman-adv/hard-interface.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c index b8f8da7e..dce55578 100644 --- a/net/batman-adv/hard-interface.c +++ b/net/batman-adv/hard-interface.c @@ -700,6 +700,9 @@ int batadv_hardif_enable_interface(struct batadv_hard_iface *hard_iface, int max_header_len = batadv_max_header_len(); int ret; + if (hard_iface->net_dev->mtu < ETH_MIN_MTU + max_header_len) + return -EINVAL; + if (hard_iface->if_status != BATADV_IF_NOT_IN_USE) goto out;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits