From: Sven Eckelmann <sven@narfation.org>
To: Andrew Lunn <andrew@lunn.ch>
Cc: "B.A.T.M.A.N" <b.a.t.m.a.n@lists.open-mesh.org>
Subject: Re: [B.A.T.M.A.N.] [PATCH v2 02/12] batman-adv: compat.h: Add workaround for get_link_net()
Date: Sat, 30 Apr 2016 12:00:05 +0200 [thread overview]
Message-ID: <1991019.ZB5CQeA6YM@sven-edge> (raw)
In-Reply-To: <1461970765-24615-3-git-send-email-andrew@lunn.ch>
[-- Attachment #1: Type: text/plain, Size: 3901 bytes --]
On Saturday 30 April 2016 00:59:15 Andrew Lunn wrote:
> Signed-off-by: Sven Eckelmann <sven@narfation.org>
> Signed-off-by: Andrew Lunn <andrew@lunn.ch>
> ---
> compat.h | 8 +++++++-
> 1 file changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/compat.h b/compat.h
> index 5a5f478..f746163 100644
> --- a/compat.h
> +++ b/compat.h
> @@ -137,9 +137,15 @@ static int __batadv_interface_kill_vid(struct
> net_device *dev, __be16 proto,\ #warning cfg80211 based throughput metric
> is only supported with Linux 3.15+
>
> #endif
> -
> #endif /* < KERNEL_VERSION(3, 15, 0) */
>
> +#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 +
> +#endif /* < KERNEL_VERSION(4, 0, 0) */
> +
> #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 3, 0)
>
> #define IFF_NO_QUEUE 0; dev->tx_queue_len = 0
This cannot work because you've modified the initial patch
and used parts of your old patch again.
/qemu-batman/batman-adv/net/batman-adv/hard-interface.c: In function ‘batadv_getlink_net’:
/qemu-batman/batman-adv/net/batman-adv/hard-interface.c:104:9: warning: return makes pointer from integer without a cast [-Wint-conversion]
return netdev->rtnl_link_ops->get_link_net(netdev);
^
/qemu-batman/batman-adv/net/batman-adv/hard-interface.c: In function ‘batadv_mutual_parents’:
/qemu-batman/batman-adv/net/batman-adv/hard-interface.c:131:26: warning: suggest parentheses around ‘&&’ within ‘||’ [-Wparentheses]
if (dev1->rtnl_link_ops && dev1->rtnl_link_ops->get_link_net)
^
In file included from <command-line>:0:0:
/qemu-batman/batman-adv/compat.h:151:46: error: ‘netdev’ undeclared (first use in this function)
#define get_link_net get_xstats_size || 1 || netdev->rtnl_link_ops->get_xstats_size
^
/qemu-batman/batman-adv/net/batman-adv/hard-interface.c:131:50: note: in expansion of macro ‘get_link_net’
if (dev1->rtnl_link_ops && dev1->rtnl_link_ops->get_link_net)
^
/qemu-batman/batman-adv/compat.h:151:46: note: each undeclared identifier is reported only once for each function it appears in
#define get_link_net get_xstats_size || 1 || netdev->rtnl_link_ops->get_xstats_size
^
/qemu-batman/batman-adv/net/batman-adv/hard-interface.c:131:50: note: in expansion of macro ‘get_link_net’
if (dev1->rtnl_link_ops && dev1->rtnl_link_ops->get_link_net)
^
/qemu-batman/batman-adv/net/batman-adv/hard-interface.c:133:26: warning: suggest parentheses around ‘&&’ within ‘||’ [-Wparentheses]
if (dev2->rtnl_link_ops && dev2->rtnl_link_ops->get_link_net)
^
/qemu-batman/batman-adv/net/batman-adv/hard-interface.c: In function ‘batadv_is_on_batman_iface’:
/qemu-batman/batman-adv/net/batman-adv/hard-interface.c:174:29: warning: suggest parentheses around ‘&&’ within ‘||’ [-Wparentheses]
if (net_dev->rtnl_link_ops && net_dev->rtnl_link_ops->get_link_net)
^
In file included from <command-line>:0:0:
/qemu-batman/batman-adv/compat.h:151:46: error: ‘netdev’ undeclared (first use in this function)
#define get_link_net get_xstats_size || 1 || netdev->rtnl_link_ops->get_xstats_size
^
/qemu-batman/batman-adv/net/batman-adv/hard-interface.c:174:56: note: in expansion of macro ‘get_link_net’
if (net_dev->rtnl_link_ops && net_dev->rtnl_link_ops->get_link_net
Kind regards,
Sven
[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next prev parent reply other threads:[~2016-04-30 10:00 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-29 22:59 [B.A.T.M.A.N.] [PATCH v2 00/12] netns and netlink support Andrew Lunn
2016-04-29 22:59 ` [B.A.T.M.A.N.] [PATCH v2 01/12] batman-adv: Handle parent interfaces in a different netns Andrew Lunn
2016-04-29 22:59 ` [B.A.T.M.A.N.] [PATCH v2 02/12] batman-adv: compat.h: Add workaround for get_link_net() Andrew Lunn
2016-04-30 10:00 ` Sven Eckelmann [this message]
2016-04-30 10:04 ` Sven Eckelmann
2016-04-29 22:59 ` [B.A.T.M.A.N.] [PATCH v2 03/12] batman-adv: Suppress debugfs entries for netns's Andrew Lunn
2016-04-29 22:59 ` [B.A.T.M.A.N.] [PATCH v2 04/12] batman-adv: add generic netlink query API to replace debugfs files Andrew Lunn
2016-04-29 22:59 ` [B.A.T.M.A.N.] [PATCH v2 05/12] batman-adv: compat: Workarounds for previous patch Andrew Lunn
2016-04-29 22:59 ` [B.A.T.M.A.N.] [PATCH v2 06/12] batman-adv: netlink: add translation table query Andrew Lunn
2016-04-29 22:59 ` [B.A.T.M.A.N.] [PATCH v2 07/12] batman-adv: netlink: add originator and neighbor table queries Andrew Lunn
2016-04-30 10:02 ` Sven Eckelmann
2016-04-29 22:59 ` [B.A.T.M.A.N.] [PATCH v2 08/12] batman-adv: add B.A.T.M.A.N. IV bat_{orig, neigh}_dump implementations Andrew Lunn
2016-04-29 22:59 ` [B.A.T.M.A.N.] [PATCH v2 09/12] batman-adv: add B.A.T.M.A.N. V " Andrew Lunn
2016-04-29 22:59 ` [B.A.T.M.A.N.] [PATCH v2 10/12] batman-adv: Indicate netlink socket can be used with netns Andrew Lunn
2016-04-29 22:59 ` [B.A.T.M.A.N.] [PATCH v2 11/12] batman-adv: add B.A.T.M.A.N. Dump gateways via netlink Andrew Lunn
2016-04-29 22:59 ` [B.A.T.M.A.N.] [PATCH v2 12/12] batman-adv: add B.A.T.M.A.N. Dump BLA claims " Andrew Lunn
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=1991019.ZB5CQeA6YM@sven-edge \
--to=sven@narfation.org \
--cc=andrew@lunn.ch \
--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