From df56faedb87a4beddbe8b478210bf71ebdfd7de5 Mon Sep 17 00:00:00 2001 From: Marek Lindner Date: Wed, 18 Feb 2015 21:18:05 +0800 Subject: [PATCH 2/3] remove netdev_* calls --- hard-interface.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hard-interface.c b/hard-interface.c index 010a403..64ef086 100644 --- a/hard-interface.c +++ b/hard-interface.c @@ -411,9 +411,9 @@ int batadv_hardif_enable_interface(struct batadv_hard_iface *hard_iface, hard_iface->soft_iface = soft_iface; bat_priv = netdev_priv(hard_iface->soft_iface); - ret = netdev_master_upper_dev_link(hard_iface->net_dev, soft_iface); + /*ret = netdev_master_upper_dev_link(hard_iface->net_dev, soft_iface); if (ret) - goto err_dev; + goto err_dev;*/ ret = bat_priv->bat_algo_ops->bat_iface_enable(hard_iface); if (ret < 0) @@ -466,7 +466,7 @@ out: return 0; err_upper: - netdev_upper_dev_unlink(hard_iface->net_dev, soft_iface); + /*netdev_upper_dev_unlink(hard_iface->net_dev, soft_iface);*/ err_dev: hard_iface->soft_iface = NULL; dev_put(soft_iface); @@ -521,7 +521,7 @@ void batadv_hardif_disable_interface(struct batadv_hard_iface *hard_iface, batadv_softif_destroy_sysfs(hard_iface->soft_iface); } - netdev_upper_dev_unlink(hard_iface->net_dev, hard_iface->soft_iface); + /*netdev_upper_dev_unlink(hard_iface->net_dev, hard_iface->soft_iface);*/ hard_iface->soft_iface = NULL; batadv_hardif_free_ref(hard_iface); -- 2.1.4