public inbox for b.a.t.m.a.n@lists.open-mesh.org
 help / color / mirror / Atom feed
From: "Linus Lüssing" <linus.luessing@c0d3.blue>
To: b.a.t.m.a.n@lists.open-mesh.org
Subject: [B.A.T.M.A.N.] [PATCH 2/4] batman-adv: compat: fix warning in hard-interface.c for < 4.0
Date: Sun, 22 Jan 2017 21:40:41 +0100	[thread overview]
Message-ID: <20170122204043.29668-2-linus.luessing@c0d3.blue> (raw)
In-Reply-To: <20170122204043.29668-1-linus.luessing@c0d3.blue>

This fixes the following warning:

hard-interface.c:104:39: warning: incorrect type in return expression (different base types)
hard-interface.c:104:39:    expected struct net *
hard-interface.c:104:39:    got bool

Which allows compiling with -Werror again on kernels < 4.0.

Fixes: bea804dbde21 ("batman-adv: Handle parent interfaces in a different netns")
Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
---
 compat.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/compat.h b/compat.h
index 8e23911..8628cf5 100644
--- a/compat.h
+++ b/compat.h
@@ -153,8 +153,8 @@ static int __batadv_interface_kill_vid(struct net_device *dev, __be16 proto,\
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 0, 0)
 
-/* WARNING for batadv_getlink_net */
-#define get_link_net get_xstats_size || 1 || netdev->rtnl_link_ops->get_xstats_size
+/* wild hack for batadv_getlink_net only */
+#define get_link_net get_xstats_size || 1 ? fallback_net : (struct net*)netdev->rtnl_link_ops->get_xstats_size
 
 #endif /* < KERNEL_VERSION(4, 0, 0) */
 
-- 
2.1.4


  reply	other threads:[~2017-01-22 20:40 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-01-22 20:40 [B.A.T.M.A.N.] [PATCH 1/4] batman-adv: compat: workaround for issues with make-kpkg for 4.5 kernels Linus Lüssing
2017-01-22 20:40 ` Linus Lüssing [this message]
2017-01-22 20:40 ` [B.A.T.M.A.N.] [PATCH 3/4] batman-adv: compat: fix compile error for cfg80211_get_station on v3.15 Linus Lüssing
2017-01-22 20:40 ` [B.A.T.M.A.N.] [PATCH 4/4] batman-adv: compat: add missing includes for compat skbuff.c Linus Lüssing
2017-01-23  8:58 ` [B.A.T.M.A.N.] [PATCH 1/4] batman-adv: compat: workaround for issues with make-kpkg for 4.5 kernels Sven Eckelmann

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170122204043.29668-2-linus.luessing@c0d3.blue \
    --to=linus.luessing@c0d3.blue \
    --cc=b.a.t.m.a.n@lists.open-mesh.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox