aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac802154
diff options
context:
space:
mode:
Diffstat (limited to 'net/mac802154')
-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,
28 struct net_device *dev; 28 struct net_device *dev;
29 29
30 rtnl_lock(); 30 rtnl_lock();
31 dev = ieee802154_if_add(local, name, NULL, type); 31 dev = ieee802154_if_add(local, name, type);
32 rtnl_unlock(); 32 rtnl_unlock();
33 33
34 return dev; 34 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);
176void ieee802154_if_remove(struct ieee802154_sub_if_data *sdata); 176void ieee802154_if_remove(struct ieee802154_sub_if_data *sdata);
177struct net_device * 177struct net_device *
178ieee802154_if_add(struct ieee802154_local *local, const char *name, 178ieee802154_if_add(struct ieee802154_local *local, const char *name,
179 struct wpan_dev **new_wpan_dev, enum nl802154_iftype type); 179 enum nl802154_iftype type);
180void ieee802154_remove_interfaces(struct ieee802154_local *local); 180void ieee802154_remove_interfaces(struct ieee802154_local *local);
181 181
182#endif /* __IEEE802154_I_H */ 182#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,
458 458
459struct net_device * 459struct net_device *
460ieee802154_if_add(struct ieee802154_local *local, const char *name, 460ieee802154_if_add(struct ieee802154_local *local, const char *name,
461 struct wpan_dev **new_wpan_dev, enum nl802154_iftype type) 461 enum nl802154_iftype type)
462{ 462{
463 struct net_device *ndev = NULL; 463 struct net_device *ndev = NULL;
464 struct ieee802154_sub_if_data *sdata = NULL; 464 struct ieee802154_sub_if_data *sdata = NULL;
@@ -516,9 +516,6 @@ ieee802154_if_add(struct ieee802154_local *local, const char *name,
516 list_add_tail_rcu(&sdata->list, &local->interfaces); 516 list_add_tail_rcu(&sdata->list, &local->interfaces);
517 mutex_unlock(&local->iflist_mtx); 517 mutex_unlock(&local->iflist_mtx);
518 518
519 if (new_wpan_dev)
520 *new_wpan_dev = &sdata->wpan_dev;
521
522 return ndev; 519 return ndev;
523 520
524err: 521err:
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)
161 161
162 rtnl_lock(); 162 rtnl_lock();
163 163
164 dev = ieee802154_if_add(local, "wpan%d", NULL, NL802154_IFTYPE_NODE); 164 dev = ieee802154_if_add(local, "wpan%d", NL802154_IFTYPE_NODE);
165 if (IS_ERR(dev)) { 165 if (IS_ERR(dev)) {
166 rtnl_unlock(); 166 rtnl_unlock();
167 rc = PTR_ERR(dev); 167 rc = PTR_ERR(dev);