mac802154: remove wpan_dev parameter in if_add

This parameter was grabbed from wireless implementation with the
identically wireless dev struct. We don't need this right now and so we
remove it. Maybe we will add it later again if we found any real reason
to have such parameter.

Signed-off-by: Alexander Aring <alex.aring@gmail.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

diff --git a/net/mac802154/cfg.c b/net/mac802154/cfg.c
index 2b3610c514893d1c3ecf6f87c6fd1f71c351b464..2abe7e5f0974bda0e42c483f0791aef5dde17c62 100644 (file)
--- a/net/mac802154/cfg.c
+++ b/net/mac802154/cfg.c
@@ -28,7 +28,7 @@ ieee802154_add_iface_deprecated(struct wpan_phy *wpan_phy,
        struct net_device *dev;
 
        rtnl_lock();
-       dev = ieee802154_if_add(local, name, NULL, type);
+       dev = ieee802154_if_add(local, name, type);
        rtnl_unlock();
 
        return dev;

diff --git a/net/mac802154/ieee802154_i.h b/net/mac802154/ieee802154_i.h
index 6ad5e8912a4c01addde26abbce1bd2d41902480b..46553830896d1d68d9b887b2152f7804c6d96c46 100644 (file)
--- a/net/mac802154/ieee802154_i.h
+++ b/net/mac802154/ieee802154_i.h
@@ -176,7 +176,7 @@ void ieee802154_iface_exit(void);
 void ieee802154_if_remove(struct ieee802154_sub_if_data *sdata);
 struct net_device *
 ieee802154_if_add(struct ieee802154_local *local, const char *name,
-                 struct wpan_dev **new_wpan_dev, enum nl802154_iftype type);
+                 enum nl802154_iftype type);
 void ieee802154_remove_interfaces(struct ieee802154_local *local);
 
 #endif /* __IEEE802154_I_H */

diff --git a/net/mac802154/iface.c b/net/mac802154/iface.c
index cc992e8405d36c86167478f157b3f2bb3d81cfd6..ba63ac93ae9046514e207acd5c9960e180dea36b 100644 (file)
--- a/net/mac802154/iface.c
+++ b/net/mac802154/iface.c
@@ -458,7 +458,7 @@ ieee802154_setup_sdata(struct ieee802154_sub_if_data *sdata,
 
 struct net_device *
 ieee802154_if_add(struct ieee802154_local *local, const char *name,
-                 struct wpan_dev **new_wpan_dev, enum nl802154_iftype type)
+                 enum nl802154_iftype type)
 {
        struct net_device *ndev = NULL;
        struct ieee802154_sub_if_data *sdata = NULL;
@@ -516,9 +516,6 @@ ieee802154_if_add(struct ieee802154_local *local, const char *name,
        list_add_tail_rcu(&sdata->list, &local->interfaces);
        mutex_unlock(&local->iflist_mtx);
 
-       if (new_wpan_dev)
-               *new_wpan_dev = &sdata->wpan_dev;
-
        return ndev;
 
 err:

diff --git a/net/mac802154/main.c b/net/mac802154/main.c
index 2e42fc2e430c50a570ab5009b12f085a2cd65e6c..bbb19dd585a07646c7452be8edd56cca3c9d5b43 100644 (file)
--- a/net/mac802154/main.c
+++ b/net/mac802154/main.c
@@ -161,7 +161,7 @@ int ieee802154_register_hw(struct ieee802154_hw *hw)
 
        rtnl_lock();
 
-       dev = ieee802154_if_add(local, "wpan%d", NULL, NL802154_IFTYPE_NODE);
+       dev = ieee802154_if_add(local, "wpan%d", NL802154_IFTYPE_NODE);
        if (IS_ERR(dev)) {
                rtnl_unlock();
                rc = PTR_ERR(dev);