From patchwork Sat Oct 7 12:18:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Eckelmann X-Patchwork-Id: 17098 X-Patchwork-Delegate: sw@simonwunderlich.de Return-Path: 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 E1FFD80B59; Sat, 7 Oct 2017 14:19:15 +0200 (CEST) Authentication-Results: open-mesh.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=narfation.org header.i=@narfation.org header.b="v/++Hd6n"; dkim-atps=neutral Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=79.140.41.39; helo=v3-1039.vlinux.de; envelope-from=sven@narfation.org; receiver= Received: from v3-1039.vlinux.de (narfation.org [79.140.41.39]) by open-mesh.org (Postfix) with ESMTPS id E596280415 for ; Sat, 7 Oct 2017 14:19:01 +0200 (CEST) Received: from sven-desktop.home.narfation.org (p200300C593D546F990818D7E1CB10859.dip0.t-ipconnect.de [IPv6:2003:c5:93d5:46f9:9081:8d7e:1cb1:859]) by v3-1039.vlinux.de (Postfix) with ESMTPSA id 76FF01100F6 for ; Sat, 7 Oct 2017 14:18:56 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=narfation.org; s=20121; t=1507378736; bh=48Wfo9rWli7pYFZ4WAk5SO/UF2VHUM9DR06Qg7ZIfBU=; h=From:To:Subject:Date:From; b=v/++Hd6nau6IJuvXQQuFsYUDKe3NOkPjbdlht6osXokBUAyH5kxyFlP7E4cnSO494 OSjkEniC+0Dgm8fd1xbM97uFVpSy8VpGHm8Vp8BCbpPGukZ7XA6B5UQS84PI2WVi0P NRlWiQivMhY3mQxhqp7QYfpJ3PwFmvF3dbiPx9tA= From: Sven Eckelmann To: b.a.t.m.a.n@lists.open-mesh.org Date: Sat, 7 Oct 2017 14:18:52 +0200 Message-Id: <20171007121853.6278-1-sven@narfation.org> X-Mailer: git-send-email 2.11.0 Subject: [B.A.T.M.A.N.] [PATCH 1/3] batman-adv: Add extack to ndo_add_slave X-BeenThere: b.a.t.m.a.n@lists.open-mesh.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: The list for a Better Approach To Mobile Ad-hoc Networking List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: The list for a Better Approach To Mobile Ad-hoc Networking Errors-To: b.a.t.m.a.n-bounces@lists.open-mesh.org Sender: "B.A.T.M.A.N" From: David Ahern Pass extack to do_set_master and down to ndo_add_slave Signed-off-by: David Ahern Signed-off-by: David S. Miller [sven@narfation.org: Add compat code] Signed-off-by: Sven Eckelmann --- compat.h | 7 +++++++ net/batman-adv/soft-interface.c | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/compat.h b/compat.h index e43c4136..c10ad589 100644 --- a/compat.h +++ b/compat.h @@ -152,4 +152,11 @@ static int __batadv_interface_kill_vid(struct net_device *dev, __be16 proto,\ #endif /* < KERNEL_VERSION(4, 6, 0) */ +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) + +#define batadv_softif_slave_add(__dev, __slave_dev, __extack) \ + batadv_softif_slave_add(__dev, __slave_dev) + +#endif /* < KERNEL_VERSION(4, 15, 0) */ + #endif /* _NET_BATMAN_ADV_COMPAT_H_ */ diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index 3af4b0b2..543d2c3e 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@ -867,7 +867,8 @@ static int batadv_softif_init_late(struct net_device *dev) * Return: 0 if successful or error otherwise. */ static int batadv_softif_slave_add(struct net_device *dev, - struct net_device *slave_dev) + struct net_device *slave_dev, + struct netlink_ext_ack *extack) { struct batadv_hard_iface *hard_iface; struct net *net = dev_net(dev); From patchwork Sat Oct 7 12:18:53 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Eckelmann X-Patchwork-Id: 17097 X-Patchwork-Delegate: sw@simonwunderlich.de Return-Path: 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 4CDE6809E0; Sat, 7 Oct 2017 14:19:08 +0200 (CEST) Authentication-Results: open-mesh.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=narfation.org header.i=@narfation.org header.b="emQZKP8M"; dkim-atps=neutral Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=79.140.41.39; helo=v3-1039.vlinux.de; envelope-from=sven@narfation.org; receiver= X-Greylist: delayed 19485 seconds by postgrey-1.36 at open-mesh.org; Sat, 07 Oct 2017 14:19:04 CEST Received: from v3-1039.vlinux.de (narfation.org [79.140.41.39]) by open-mesh.org (Postfix) with ESMTPS id 17A3980415 for ; Sat, 7 Oct 2017 14:19:03 +0200 (CEST) Received: from sven-desktop.home.narfation.org (p200300C593D546F990818D7E1CB10859.dip0.t-ipconnect.de [IPv6:2003:c5:93d5:46f9:9081:8d7e:1cb1:859]) by v3-1039.vlinux.de (Postfix) with ESMTPSA id 637531100FB for ; Sat, 7 Oct 2017 14:19:00 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=narfation.org; s=20121; t=1507378740; bh=qEDYFZduqqFMrSx3fVUc592d5cCAjJFf0DOZOFWN6Ps=; h=From:To:Subject:Date:In-Reply-To:References:From; b=emQZKP8MHKnJJaYNXa8zFLriW3Ve3BIoXsGH0P4g4b3hmakby8CfBzA9xZUn+4O9z y/kZhWSKlDEQgsPM+f3OVvIIwYN8qwbckjv+Ezx4zVkNr7GlwbOQaw0jRmHuziwxjE bi4dx3k74ZCqbQiG11DxMPOSQBEW1yV1VVDWlvjI= From: Sven Eckelmann To: b.a.t.m.a.n@lists.open-mesh.org Date: Sat, 7 Oct 2017 14:18:53 +0200 Message-Id: <20171007121853.6278-2-sven@narfation.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171007121853.6278-1-sven@narfation.org> References: <20171007121853.6278-1-sven@narfation.org> Subject: [B.A.T.M.A.N.] [PATCH 2/3] batman-adv: Add extack to upper device linking X-BeenThere: b.a.t.m.a.n@lists.open-mesh.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: The list for a Better Approach To Mobile Ad-hoc Networking List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: The list for a Better Approach To Mobile Ad-hoc Networking Errors-To: b.a.t.m.a.n-bounces@lists.open-mesh.org Sender: "B.A.T.M.A.N" From: David Ahern Add extack arg to netdev_upper_dev_link and netdev_master_upper_dev_link Signed-off-by: David Ahern Signed-off-by: David S. Miller [sven@narfation.org: Add compat code] Signed-off-by: Sven Eckelmann --- compat-include/linux/netdevice.h | 11 ++++++++--- net/batman-adv/hard-interface.c | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/compat-include/linux/netdevice.h b/compat-include/linux/netdevice.h index 00ed5e40..c29d6d21 100644 --- a/compat-include/linux/netdevice.h +++ b/compat-include/linux/netdevice.h @@ -66,15 +66,20 @@ #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 9, 0) -#define netdev_master_upper_dev_link(dev, upper_dev, upper_priv, upper_info) \ +#define netdev_master_upper_dev_link(dev, upper_dev, upper_priv, upper_info, extack) \ netdev_set_master(dev, upper_dev) #elif LINUX_VERSION_CODE < KERNEL_VERSION(4, 5, 0) -#define netdev_master_upper_dev_link(dev, upper_dev, upper_priv, upper_info) \ +#define netdev_master_upper_dev_link(dev, upper_dev, upper_priv, upper_info, extack) \ netdev_master_upper_dev_link(dev, upper_dev) -#endif /* < KERNEL_VERSION(4, 5, 0) */ +#elif LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) + +#define netdev_master_upper_dev_link(dev, upper_dev, upper_priv, upper_info, extack) \ + netdev_master_upper_dev_link(dev, upper_dev, upper_priv, upper_info) + +#endif /* < KERNEL_VERSION(4, 15, 0) */ #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 7, 0) diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c index d4aa99c0..4e3d5340 100644 --- a/net/batman-adv/hard-interface.c +++ b/net/batman-adv/hard-interface.c @@ -738,7 +738,7 @@ int batadv_hardif_enable_interface(struct batadv_hard_iface *hard_iface, bat_priv = netdev_priv(hard_iface->soft_iface); ret = netdev_master_upper_dev_link(hard_iface->net_dev, - soft_iface, NULL, NULL); + soft_iface, NULL, NULL, NULL); if (ret) goto err_dev; From patchwork Sat Oct 7 12:21:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Eckelmann X-Patchwork-Id: 17099 X-Patchwork-Delegate: sw@simonwunderlich.de Return-Path: 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 1C5E780A02; Sat, 7 Oct 2017 14:22:04 +0200 (CEST) Authentication-Results: open-mesh.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=narfation.org header.i=@narfation.org header.b="yQD885RP"; dkim-atps=neutral Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2001:4d88:2000:7::2; helo=v3-1039.vlinux.de; envelope-from=sven@narfation.org; receiver= Received: from v3-1039.vlinux.de (narfation.org [IPv6:2001:4d88:2000:7::2]) by open-mesh.org (Postfix) with ESMTPS id 80681809D5 for ; Sat, 7 Oct 2017 14:22:02 +0200 (CEST) Received: from sven-desktop.home.narfation.org (p200300C593D546F990818D7E1CB10859.dip0.t-ipconnect.de [IPv6:2003:c5:93d5:46f9:9081:8d7e:1cb1:859]) by v3-1039.vlinux.de (Postfix) with ESMTPSA id 44DDC1100F6; Sat, 7 Oct 2017 14:22:00 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=narfation.org; s=20121; t=1507378920; bh=zyDMaWdx01+M1377mV2K5Xtlo15Fohousnamm5iXd3A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yQD885RP8U6sJhYmOZnrHg/taQSe/llGhWWUb/kfka7bapwtsoskkgKcAwtDEzkME rk5OdPh6OFO0jmAk4A4ZppvhbUTlftaFCqaqnZzDuIuaUL+C0+jm0RFWERnNqsAr2i QnSSb75ssDXmsPNMeGcRCRB//X8zqDEC+UyIahoo= From: Sven Eckelmann To: b.a.t.m.a.n@lists.open-mesh.org Date: Sat, 7 Oct 2017 14:21:22 +0200 Message-Id: <20171007122122.6470-1-sven@narfation.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171007121853.6278-1-sven@narfation.org> References: <20171007121853.6278-1-sven@narfation.org> Subject: [B.A.T.M.A.N.] [PATCH 3/3] batman-adv: Add missing kerneldoc for extack X-BeenThere: b.a.t.m.a.n@lists.open-mesh.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: The list for a Better Approach To Mobile Ad-hoc Networking List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: The list for a Better Approach To Mobile Ad-hoc Networking Cc: netdev@vger.kernel.org, davem@davemloft.net, David Ahern Errors-To: b.a.t.m.a.n-bounces@lists.open-mesh.org Sender: "B.A.T.M.A.N" The parameter extack was added to batadv_softif_slave_add without adding the kernel-doc for it. This caused kernel-doc warnings. Signed-off-by: Sven Eckelmann Cc: David Ahern Acked-by: David Ahern --- net/batman-adv/soft-interface.c | 1 + 1 file changed, 1 insertion(+) diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index 543d2c3e..9f673cdf 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@ -863,6 +863,7 @@ static int batadv_softif_init_late(struct net_device *dev) * batadv_softif_slave_add - Add a slave interface to a batadv_soft_interface * @dev: batadv_soft_interface used as master interface * @slave_dev: net_device which should become the slave interface + * @extack: extended ACK report struct * * Return: 0 if successful or error otherwise. */