diff options
| author |   David S. Miller <davem@davemloft.net> | 2020-03-09 19:08:43 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-03-09 19:08:43 -0700 |
| commit | 2362059427494b9e318161f0447a10dc5513b2c3 (patch) | |
| tree | 3f40769df9d9443bb85add85fe1a85f20e81a6cc /net | |
| parent | net: mscc: ocelot: properly account for VLAN header length when setting MRU (diff) | |
| parent | batman-adv: Don't schedule OGM for disabled interface (diff) | |
| download | wireguard-linux-2362059427494b9e318161f0447a10dc5513b2c3.tar.xz wireguard-linux-2362059427494b9e318161f0447a10dc5513b2c3.zip | |
Merge tag 'batadv-net-for-davem-20200306' of git://git.open-mesh.org/linux-merge
Simon Wunderlich says:
====================
Here is a batman-adv bugfix:
- Don't schedule OGM for disabled interface, by Sven Eckelmann
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/batman-adv/bat_iv_ogm.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c index f0209505e41a..a7c8dd7ae513 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@ -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 |