Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 133d3f31 authored by Alexander Aring's avatar Alexander Aring Committed by Marcel Holtmann
Browse files

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: default avatarAlexander Aring <alex.aring@gmail.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 944742a3

net/mac802154/cfg.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

net/mac802154/ieee802154_i.h

+1 −1
Original line number Diff line number Diff line
@@ -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 */

net/mac802154/iface.c

+1 −4
Original line number Diff line number Diff line
@@ -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:

net/mac802154/main.c

+1 −1
Original line number Diff line number Diff line
@@ -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);