From: David Ahern <dsahern(a)gmail.com>
Pass extack to do_set_master and down to ndo_add_slave
Signed-off-by: David Ahern <dsahern(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
---
This change is already part of net-next (queued up for 4.15) we must
therefore apply it after the compat code was added.
net/batman-adv/soft-interface.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
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);
--
2.11.0
Hi David,
here is a small cleanup pull request of batman-adv to go into net-next.
Please pull or let me know of any problem!
Thank you,
Simon
The following changes since commit 242c1a28eb61cb34974e8aa05235d84355940a8a:
net: Remove useless function skb_header_release (2017-09-22 20:43:13 -0700)
are available in the git repository at:
git://git.open-mesh.org/linux-merge.git tags/batadv-next-for-davem-20171006
for you to fetch changes up to 706cc9f51d9a22528af18d4b3ffbd17b30a1d3b0:
batman-adv: Add argument names for function ptr definitions (2017-09-30 09:31:34 +0200)
----------------------------------------------------------------
This cleanup patchset includes the following patches:
- bump version strings, by Simon Wunderlich
- Cleanup patches to make checkpatch happy, by Sven Eckelmann (3 patches)
----------------------------------------------------------------
Simon Wunderlich (1):
batman-adv: Start new development cycle
Sven Eckelmann (3):
batman-adv: Remove unnecessary parentheses
batman-adv: Fix "line over 80 characters" checkpatch warning
batman-adv: Add argument names for function ptr definitions
net/batman-adv/bat_iv_ogm.c | 24 ++++++++++++------------
net/batman-adv/bat_v.c | 2 +-
net/batman-adv/bat_v_elp.c | 6 +++---
net/batman-adv/bat_v_ogm.c | 12 ++++++------
net/batman-adv/distributed-arp-table.c | 4 ++--
net/batman-adv/gateway_client.c | 8 ++++----
net/batman-adv/gateway_common.c | 18 +++++++++---------
net/batman-adv/hard-interface.c | 12 ++++++------
net/batman-adv/icmp_socket.c | 4 ++--
net/batman-adv/main.c | 12 ++++++------
net/batman-adv/main.h | 2 +-
net/batman-adv/multicast.c | 2 +-
net/batman-adv/originator.c | 26 +++++++++++++-------------
net/batman-adv/routing.c | 6 +++---
net/batman-adv/send.c | 6 +++---
net/batman-adv/soft-interface.c | 6 +++---
net/batman-adv/sysfs.c | 4 ++--
net/batman-adv/tp_meter.c | 2 +-
18 files changed, 78 insertions(+), 78 deletions(-)
Hi Simon, Sven,
Thank you very much for your help. Our batman-adv BATMAN_IV are deployed
in 100+ (may be more) sites, and works almost perfectly.
There is a minor issue: after reboot the board, sometimes it takes
several minutes to join mesh after reboot when there are <4 nodes in the
network.
- Usually board joins mesh instantly.
- When this happens, I can still 'ping ip-address%mesh0' using IBSS
interface, so it is likely a batman-adv issue.
- This does not happen when I have >=4 nodes in the mesh network.
-- For a setup of 6 nodes, I run the automated test for 1000 cycles,
and no issues.
I use the automated test:
- reboot one board, and sleep 20 seconds
- 'batctl n | tail -1 | grep mesh0' to see if it is empty.
Here is my environment:
- Atheros ar9331 MIPS platform + built-in ath9k WiFi
- OpenWRT tag 15.05
- batman-adv version 2016.1.3 (with 22 patches in patches/ subfolder as
you know it very well)
- routing_algos = BATMAN_IV
Is this a known issue? Thanks again.
Xuebing Wang