diff options
| author | Simon Wunderlich <sw@simonwunderlich.de> | 2020-10-27 17:07:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-27 17:07:28 +0100 |
| commit | 83f515d7ae76e5a7460c0eacadae806363df05a1 (patch) | |
| tree | 894546dfd55a6b0ae533c5261639b67b056c99af | |
| parent | 8f47c32d5827f7c1d34e956e440c4b654f7936c5 (diff) | |
| parent | 7448ab9d65e45ffbc89acb4a1645782edd808291 (diff) | |
Merge pull request #624 from ecsv/batadv-for-18.06openwrt-18.06
batman-adv: Fix missing include for backported 2020.4 patch
| -rw-r--r-- | batman-adv/patches/0052-batman-adv-mcast-fix-duplicate-mcast-packets-in-BLA-.patch | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/batman-adv/patches/0052-batman-adv-mcast-fix-duplicate-mcast-packets-in-BLA-.patch b/batman-adv/patches/0052-batman-adv-mcast-fix-duplicate-mcast-packets-in-BLA-.patch index 46eb33f..07e7d27 100644 --- a/batman-adv/patches/0052-batman-adv-mcast-fix-duplicate-mcast-packets-in-BLA-.patch +++ b/batman-adv/patches/0052-batman-adv-mcast-fix-duplicate-mcast-packets-in-BLA-.patch @@ -41,10 +41,10 @@ Signed-off-by: Sven Eckelmann <sven@narfation.org> Origin: backport, https://git.open-mesh.org/batman-adv.git/commit/3c39a2455a5be02ecceeaf1a15976bddd611392e diff --git a/net/batman-adv/multicast.c b/net/batman-adv/multicast.c -index 39640d3d6fbdf8244344db6e79f2d769eb0972d9..adfad7cb34b4d3a8b6ebffd6b19854616ca0f97b 100644 +index 39640d3d6fbdf8244344db6e79f2d769eb0972d9..764c304ffa5f6dc976050fa6b6f6e0891981c4f4 100644 --- a/net/batman-adv/multicast.c +++ b/net/batman-adv/multicast.c -@@ -62,6 +62,7 @@ +@@ -62,10 +62,12 @@ #include <uapi/linux/batadv_packet.h> #include <uapi/linux/batman_adv.h> @@ -52,7 +52,12 @@ index 39640d3d6fbdf8244344db6e79f2d769eb0972d9..adfad7cb34b4d3a8b6ebffd6b1985461 #include "hard-interface.h" #include "hash.h" #include "log.h" -@@ -1027,6 +1028,35 @@ batadv_mcast_forw_mode(struct batadv_priv *bat_priv, struct sk_buff *skb, + #include "netlink.h" ++#include "send.h" + #include "soft-interface.h" + #include "translation-table.h" + #include "tvlv.h" +@@ -1027,6 +1029,35 @@ batadv_mcast_forw_mode(struct batadv_priv *bat_priv, struct sk_buff *skb, } } |