diff mbox series

[1/3] batman-adv: Add extack to ndo_add_slave

Message ID 20171007121853.6278-1-sven@narfation.org (mailing list archive)
State Accepted, archived
Commit 621c17e76450528c6803c326837917d96388d992
Delegated to: Simon Wunderlich
Headers
Series [1/3] batman-adv: Add extack to ndo_add_slave |

Commit Message

Sven Eckelmann Oct. 7, 2017, 12:18 p.m. UTC 
  From: David Ahern <dsahern@gmail.com>

Pass extack to do_set_master and down to ndo_add_slave

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.h                        | 7 +++++++
 net/batman-adv/soft-interface.c | 3 ++-
 2 files changed, 9 insertions(+), 1 deletion(-)

Comments

Sven Eckelmann Oct. 16, 2017, 5:07 p.m. UTC | #1 
On Samstag, 7. Oktober 2017 14:18:52 CEST Sven Eckelmann wrote:
> From: David Ahern <dsahern@gmail.com>
> 
> Pass extack to do_set_master and down to ndo_add_slave
> 
> 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.h                        | 7 +++++++
>  net/batman-adv/soft-interface.c | 3 ++-
>  2 files changed, 9 insertions(+), 1 deletion(-)


All three patches applied in 7a1f25d9..0ce469be [1,2,3]

Kind regards,
	Sven

[1] https://patchwork.open-mesh.org/patch/17098/
[2] https://patchwork.open-mesh.org/patch/17097/
[3] https://patchwork.open-mesh.org/patch/17099/
Sven Eckelmann Oct. 16, 2017, 5:12 p.m. UTC | #2 
On Montag, 16. Oktober 2017 19:07:25 CEST Sven Eckelmann wrote:
> On Samstag, 7. Oktober 2017 14:18:52 CEST Sven Eckelmann wrote:
> > From: David Ahern <dsahern@gmail.com>
> > 
> > Pass extack to do_set_master and down to ndo_add_slave
> > 
> > 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.h                        | 7 +++++++
> >  net/batman-adv/soft-interface.c | 3 ++-
> >  2 files changed, 9 insertions(+), 1 deletion(-)
> 
> 
> All three patches applied in 7a1f25d9..0ce469be [1,2,3]
> 
> Kind regards,
> 	Sven

[1] https://git.open-mesh.org/batman-adv.git/commit/621c17e76450528c6803c326837917d96388d992
[2] https://git.open-mesh.org/batman-adv.git/commit/93418db608c2d131ef2956aa6c436c8182183184
[3] https://git.open-mesh.org/batman-adv.git/commit/0ce469be3baf302612379995611ae285a886fb57
diff mbox series

Patch

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);