Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-22 20:22:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

mac802154: remove wpan_dev parameter in if_add

Browse Source 
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>
This commit is contained in:
Alexander Aring 2014-11-17 08:20:50 +01:00 committed by Marcel Holtmann
parent 944742a36d
commit 133d3f3172
4 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/mac802154/cfg.c
View File

@ -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;

2
net/mac802154/ieee802154_i.h
View File

@ -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 */

5
net/mac802154/iface.c
View File

@ -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:

2
net/mac802154/main.c
View File

@ -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);