Repository : ssh://git@open-mesh.org/batman-adv

On branch : master

commit 6ba8e64a3adb5be5b3f841b19e1fa644b61b60c5 Author: Sven Eckelmann sven@narfation.org Date: Tue Oct 25 07:57:45 2016 +0200

batman-adv: Fix function signature for get_link_net spatch

The function signature of batadv_getlink_net was changed before the coccinelle patch was applied. This change has to be integrated in the patch to make it apply cleanly.

Signed-off-by: Sven Eckelmann sven@narfation.org

6ba8e64a3adb5be5b3f841b19e1fa644b61b60c5 compat-patches/0004-get_link_net.cocci | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/compat-patches/0004-get_link_net.cocci b/compat-patches/0004-get_link_net.cocci index 1ae3192..7520bb6 100644 --- a/compat-patches/0004-get_link_net.cocci +++ b/compat-patches/0004-get_link_net.cocci @@ -2,8 +2,8 @@ identifier netdev, fallback_net; @@

- static const struct net *batadv_getlink_net(const struct net_device *netdev, - const struct net *fallback_net) + static struct net *batadv_getlink_net(const struct net_device *netdev, + struct net *fallback_net) { +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 0, 0) + return fallback_net;