| Message ID | 1461970765-24615-3-git-send-email-andrew@lunn.ch (mailing list archive) |
|---|---|
| State | Superseded, archived |
| Delegated to: | Marek Lindner |
| Headers |
Return-Path: <b.a.t.m.a.n-bounces@lists.open-mesh.org> X-Original-To: patchwork@open-mesh.org Delivered-To: patchwork@open-mesh.org Received: from open-mesh.org (localhost [IPv6:::1]) by open-mesh.org (Postfix) with ESMTP id 8CED682312; Sat, 30 Apr 2016 01:00:12 +0200 (CEST) Authentication-Results: open-mesh.org; dmarc=none header.from=lunn.ch Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=178.209.37.122; helo=vps0.lunn.ch; envelope-from=andrew@lunn.ch; receiver=b.a.t.m.a.n@lists.open-mesh.net Authentication-Results: open-mesh.org; dmarc=none header.from=lunn.ch Received: from vps0.lunn.ch (vps0.lunn.ch [178.209.37.122]) by open-mesh.org (Postfix) with ESMTPS id B43E88230B for <b.a.t.m.a.n@lists.open-mesh.net>; Sat, 30 Apr 2016 01:00:11 +0200 (CEST) Received: from andrew by vps0.lunn.ch with local (Exim 4.80) (envelope-from <andrew@lunn.ch>) id 1awHNe-0006Pf-Gm; Sat, 30 Apr 2016 00:59:26 +0200 From: Andrew Lunn <andrew@lunn.ch> To: "B.A.T.M.A.N" <b.a.t.m.a.n@lists.open-mesh.net> Date: Sat, 30 Apr 2016 00:59:15 +0200 Message-Id: <1461970765-24615-3-git-send-email-andrew@lunn.ch> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1461970765-24615-1-git-send-email-andrew@lunn.ch> References: <1461970765-24615-1-git-send-email-andrew@lunn.ch> Subject: [B.A.T.M.A.N.] [PATCH v2 02/12] batman-adv: compat.h: Add workaround for get_link_net() X-BeenThere: b.a.t.m.a.n@lists.open-mesh.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: The list for a Better Approach To Mobile Ad-hoc Networking <b.a.t.m.a.n.lists.open-mesh.org> List-Unsubscribe: <https://lists.open-mesh.org/mm/options/b.a.t.m.a.n>, <mailto:b.a.t.m.a.n-request@lists.open-mesh.org?subject=unsubscribe> List-Archive: <http://lists.open-mesh.org/pipermail/b.a.t.m.a.n/> List-Post: <mailto:b.a.t.m.a.n@lists.open-mesh.org> List-Help: <mailto:b.a.t.m.a.n-request@lists.open-mesh.org?subject=help> List-Subscribe: <https://lists.open-mesh.org/mm/listinfo/b.a.t.m.a.n>, <mailto:b.a.t.m.a.n-request@lists.open-mesh.org?subject=subscribe> Reply-To: The list for a Better Approach To Mobile Ad-hoc Networking <b.a.t.m.a.n@lists.open-mesh.org> Errors-To: b.a.t.m.a.n-bounces@lists.open-mesh.org Sender: "B.A.T.M.A.N" <b.a.t.m.a.n-bounces@lists.open-mesh.org> |
Commit Message
Andrew Lunn
April 29, 2016, 10:59 p.m. UTC
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(-)
Comments
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
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> > --- [...] > --- 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) */ And this line removal is also most likely just an accident. Kind regards, Sven
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