All of lore.kernel.org
 help / color / mirror / Atom feed
From: Sven Eckelmann <sven@narfation.org>
To: b.a.t.m.a.n@lists.open-mesh.org
Subject: [B.A.T.M.A.N.] [PATCH 2/3] batman-adv: Add extack to upper device linking
Date: Sat,  7 Oct 2017 14:18:53 +0200	[thread overview]
Message-ID: <20171007121853.6278-2-sven@narfation.org> (raw)
In-Reply-To: <20171007121853.6278-1-sven@narfation.org>

From: David Ahern <dsahern@gmail.com>

Add extack arg to netdev_upper_dev_link and netdev_master_upper_dev_link

Signed-off-by: David Ahern <dsahern@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
[sven@narfation.org: Add compat code]
Signed-off-by: Sven Eckelmann <sven@narfation.org>
---
 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;
 
-- 
2.11.0


  reply	other threads:[~2017-10-07 12:18 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-10-07 12:18 [B.A.T.M.A.N.] [PATCH 1/3] batman-adv: Add extack to ndo_add_slave Sven Eckelmann
2017-10-07 12:18 ` Sven Eckelmann [this message]
     [not found] ` <20171007121853.6278-1-sven-KaDOiPu9UxWEi8DpZVb4nw@public.gmane.org>
2017-10-07 12:21   ` [PATCH 3/3] batman-adv: Add missing kerneldoc for extack Sven Eckelmann
2017-10-07 12:21     ` [B.A.T.M.A.N.] " Sven Eckelmann
2017-10-07 14:23     ` David Ahern
2017-10-07 14:23       ` [B.A.T.M.A.N.] " David Ahern
2017-10-07 19:59     ` David Miller
2017-10-07 19:59       ` [B.A.T.M.A.N.] " David Miller
2017-10-08  7:29       ` Sven Eckelmann
2017-10-08  7:29         ` [B.A.T.M.A.N.] " Sven Eckelmann
2017-10-08 17:04         ` David Miller
2017-10-08 17:04           ` [B.A.T.M.A.N.] " David Miller
2017-10-16 17:07 ` [B.A.T.M.A.N.] [PATCH 1/3] batman-adv: Add extack to ndo_add_slave Sven Eckelmann
2017-10-16 17:12   ` 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=20171007121853.6278-2-sven@narfation.org \
    --to=sven@narfation.org \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.