Merge pull request #624 from ecsv/batadv-for-18.06
[feed/routing.git] / batman-adv / patches / 0051-batman-adv-Add-missing-include-for-in_interrupt.patch
1 From: Sven Eckelmann <sven@narfation.org>
2 Date: Mon, 14 Sep 2020 13:58:16 +0200
3 Subject: batman-adv: Add missing include for in_interrupt()
4
5 The fix for receiving (internally generated) bla packets outside the
6 interrupt context introduced the usage of in_interrupt(). But this
7 functionality is only defined in linux/preempt.h which was not included
8 with the same patch.
9
10 Fixes: 3747f81a1380 ("batman-adv: bla: use netif_rx_ni when not in interrupt context")
11 Signed-off-by: Sven Eckelmann <sven@narfation.org>
12
13 Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/6ea99cd9c82b2d1bc4a313fe9006bcf5d956380e
14
15 diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c
16 index 9dc574f5659e2bce97bd7e0f3793f8c1edf1fbd5..26f590ba31d49a85143f67f1c002a25dc007b594 100644
17 --- a/net/batman-adv/bridge_loop_avoidance.c
18 +++ b/net/batman-adv/bridge_loop_avoidance.c
19 @@ -37,6 +37,7 @@
20 #include <linux/lockdep.h>
21 #include <linux/netdevice.h>
22 #include <linux/netlink.h>
23 +#include <linux/preempt.h>
24 #include <linux/rculist.h>
25 #include <linux/rcupdate.h>
26 #include <linux/seq_file.h>