summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--net/mac802154/cfg.c2
-rw-r--r--net/mac802154/ieee802154_i.h2
-rw-r--r--net/mac802154/iface.c5
-rw-r--r--net/mac802154/main.c2
4 files changed, 4 insertions, 7 deletions
diff --git a/net/mac802154/cfg.c b/net/mac802154/cfg.c
index 2b3610c51489..2abe7e5f0974 100644
--- 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 6ad5e8912a4c..46553830896d 100644
--- 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 cc992e8405d3..ba63ac93ae90 100644
--- 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 2e42fc2e430c..bbb19dd585a0 100644
--- 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);