pull request for net: batman-adv 2020-03-06
Subsystems (3)
Simon Wunderlich
maintainercover pull request for net: batman-adv 2020-03-06
Hi David,
here is a bugfix 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 bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9:
Linux 5.6-rc1 (2020-02-09 16:08:48 -0800)
are available in the Git repository at:
git://git.open-mesh.org/linux-merge.git tags/batadv-net-for-davem-20200306
for you to fetch changes up to 8e8ce08198de193e3d21d42e96945216e3d9ac7f:
batman-adv: Don't schedule OGM for disabled interface (2020-02-18 09:07:55 +0100)
----------------------------------------------------------------
Here is a batman-adv bugfix:
- Don't schedule OGM for disabled interface, by Sven Eckelmann
----------------------------------------------------------------
Sven Eckelmann (1):
batman-adv: Don't schedule OGM for disabled interface
net/batman-adv/bat_iv_ogm.c | 4 ++++ 1 file changed, 4 insertions(+)
Simon Wunderlich
maintainerPATCH 1/1 batman-adv: Don't schedule OGM for disabled interface
From: Sven Eckelmann <[email protected]>
A transmission scheduling for an interface which is currently dropped by batadv_iv_ogm_iface_disable could still be in progress. The B.A.T.M.A.N. V is simply cancelling the workqueue item in an synchronous way but this is not possible with B.A.T.M.A.N. IV because the OGM submissions are intertwined.
Instead it has to stop submitting the OGM when it detect that the buffer pointer is set to NULL.
--- net/batman-adv/bat_iv_ogm.c | 4 ++++ 1 file changed, 4 insertions(+)
net/batman-adv/bat_iv_ogm.c +4 -0
@@ -789,6 +789,10 @@ static void batadv_iv_ogm_schedule_buff(struct batadv_hard_iface *hard_iface)lockdep_assert_held (&hard_iface->bat_iv.ogm_buff_mutex); +/* interface already disabled by batadv_iv_ogm_iface_disable */ +if (!*ogm_buff) +return ; +/* the interface gets activated here to avoid race conditions between * the moment of activating the interface in * hardif_activate_interface() where the originator mac is set and
Signature · 1 line
2.20.1
David Miller
maintainerFrom: Simon Wunderlich <[email protected]>
Date: Fri, 6 Mar 2020 13:06:17 +0100
Quoted 3 lines
here is a bugfix which we would like to have integrated into net.
Please pull or let me know of any problem!
Pulled, thanks Simon.