From 97dd927aca3747e1a054303638011f93373c96bf Mon Sep 17 00:00:00 2001 From: Marek Lindner Date: Wed, 18 Feb 2015 19:24:06 +0800 Subject: [PATCH] do not call master->netdev_ops->ndo_init --- hard-interface.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hard-interface.c b/hard-interface.c index fbda6b5..010a403 100644 --- a/hard-interface.c +++ b/hard-interface.c @@ -349,7 +349,7 @@ batadv_hardif_deactivate_interface(struct batadv_hard_iface *hard_iface) * is free'd and master can correctly change its internal state. * Return 0 on success, a negative value representing the error otherwise */ -static int batadv_master_del_slave(struct batadv_hard_iface *slave, +/*tatic int batadv_master_del_slave(struct batadv_hard_iface *slave, struct net_device *master) { int ret; @@ -362,7 +362,7 @@ static int batadv_master_del_slave(struct batadv_hard_iface *slave, ret = master->netdev_ops->ndo_del_slave(master, slave->net_dev); return ret; -} +}*/ int batadv_hardif_enable_interface(struct batadv_hard_iface *hard_iface, const char *iface_name) @@ -403,10 +403,10 @@ int batadv_hardif_enable_interface(struct batadv_hard_iface *hard_iface, /* check if the interface is enslaved in another virtual one and * in that case unlink it first */ - master = netdev_master_upper_dev_get(hard_iface->net_dev); + /* master = netdev_master_upper_dev_get(hard_iface->net_dev); ret = batadv_master_del_slave(hard_iface, master); if (ret) - goto err_dev; + goto err_dev; */ hard_iface->soft_iface = soft_iface; bat_priv = netdev_priv(hard_iface->soft_iface); -- 2.1.4