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

Commit 0e57547e authored by Alexander Aring's avatar Alexander Aring Committed by Marcel Holtmann
Browse files

ieee802154: setting extended address while iface add 



This patch adds support for setting an extended address while
registration a new interface. If ieee802154_is_valid_extended_addr
getting as parameter and invalid extended address then the perm address
is fallback. This is useful to make some default handling while for
example default registration of a wpan interface while phy registration.

Signed-off-by: default avatarAlexander Aring <alex.aring@gmail.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent f3ea5e44

include/net/cfg802154.h

+2 −1
Original line number Diff line number Diff line
@@ -41,7 +41,8 @@ struct cfg802154_ops { 
					       struct net_device *dev);

	int	(*add_virtual_intf)(struct wpan_phy *wpan_phy,

				    const char *name,

				    enum nl802154_iftype type);

				    enum nl802154_iftype type,

				    __le64 extended_addr);

	int	(*set_channel)(struct wpan_phy *wpan_phy, u8 page, u8 channel);

	int	(*set_pan_id)(struct wpan_phy *wpan_phy,

			      struct wpan_dev *wpan_dev, u16 pan_id);

net/ieee802154/nl802154.c

+7 −1
Original line number Diff line number Diff line
@@ -555,6 +555,7 @@ static int nl802154_new_interface(struct sk_buff *skb, struct genl_info *info) 
{

	struct cfg802154_registered_device *rdev = info->user_ptr[0];

	enum nl802154_iftype type = NL802154_IFTYPE_UNSPEC;

	__le64 extended_addr = cpu_to_le64(0x0000000000000000ULL);



	/* TODO avoid failing a new interface

	 * creation due to pending removal?
@@ -569,12 +570,17 @@ static int nl802154_new_interface(struct sk_buff *skb, struct genl_info *info) 
			return -EINVAL;

	}



	/* TODO add nla_get_le64 to netlink */

	if (info->attrs[NL802154_ATTR_EXTENDED_ADDR])

		extended_addr = (__force __le64)nla_get_u64(

				info->attrs[NL802154_ATTR_EXTENDED_ADDR]);



	if (!rdev->ops->add_virtual_intf)

		return -EOPNOTSUPP;



	return rdev_add_virtual_intf(rdev,

				     nla_data(info->attrs[NL802154_ATTR_IFNAME]),

				     type);

				     type, extended_addr);

}



static int nl802154_set_channel(struct sk_buff *skb, struct genl_info *info)

net/ieee802154/rdev-ops.h

+3 −2
Original line number Diff line number Diff line
@@ -22,9 +22,10 @@ rdev_del_virtual_intf_deprecated(struct cfg802154_registered_device *rdev, 


static inline int

rdev_add_virtual_intf(struct cfg802154_registered_device *rdev, char *name,

		      enum nl802154_iftype type)

		      enum nl802154_iftype type, __le64 extended_addr)

{

	return rdev->ops->add_virtual_intf(&rdev->wpan_phy, name, type);

	return rdev->ops->add_virtual_intf(&rdev->wpan_phy, name, type,

					   extended_addr);

}



static inline int

net/mac802154/cfg.c

+4 −3
Original line number Diff line number Diff line
@@ -28,7 +28,8 @@ ieee802154_add_iface_deprecated(struct wpan_phy *wpan_phy, 
	struct net_device *dev;



	rtnl_lock();

	dev = ieee802154_if_add(local, name, type);

	dev = ieee802154_if_add(local, name, type,

				cpu_to_le64(0x0000000000000000ULL));

	rtnl_unlock();



	return dev;
@@ -44,12 +45,12 @@ static void ieee802154_del_iface_deprecated(struct wpan_phy *wpan_phy, 


static int

ieee802154_add_iface(struct wpan_phy *phy, const char *name,

		     enum nl802154_iftype type)

		     enum nl802154_iftype type, __le64 extended_addr)

{

	struct ieee802154_local *local = wpan_phy_priv(phy);

	struct net_device *err;



	err = ieee802154_if_add(local, name, type);

	err = ieee802154_if_add(local, name, type, extended_addr);

	if (IS_ERR(err))

		return PTR_ERR(err);

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,

		  enum nl802154_iftype type);

		  enum nl802154_iftype type, __le64 extended_addr);

void ieee802154_remove_interfaces(struct ieee802154_local *local);



#endif /* __IEEE802154_I_H */