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

Commit 5b4a1039 authored by Varka Bhadram's avatar Varka Bhadram Committed by Marcel Holtmann
Browse files

cfg802154: pass name_assign_type to rdev_add_virtual_intf() 



This code is based on commit 6bab2e19
("cfg80211: pass name_assign_type to rdev_add_virtual_intf()")

This will expose in sysfs whether the ifname of a IEEE-802.15.4
device is set by userspace or generated by the kernel.
We are using two types of name_assign_types
 o NET_NAME_ENUM: Default interface name provided by kernel
 o NET_NAME_USER: Interface name provided by user.

Signed-off-by: default avatarVarka Bhadram <varkab@cdac.in>
Signed-off-by: default avatarAlexander Aring <alex.aring@gmail.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 4748e86e

include/net/cfg802154.h

+2 −0
Original line number Diff line number Diff line
@@ -30,11 +30,13 @@ struct wpan_phy_cca; 
struct cfg802154_ops {

	struct net_device * (*add_virtual_intf_deprecated)(struct wpan_phy *wpan_phy,

							   const char *name,

							   unsigned char name_assign_type,

							   int type);

	void	(*del_virtual_intf_deprecated)(struct wpan_phy *wpan_phy,

					       struct net_device *dev);

	int	(*add_virtual_intf)(struct wpan_phy *wpan_phy,

				    const char *name,

				    unsigned char name_assign_type,

				    enum nl802154_iftype type,

				    __le64 extended_addr);

	int	(*del_virtual_intf)(struct wpan_phy *wpan_phy,

net/ieee802154/nl-phy.c

+4 −1
Original line number Diff line number Diff line
@@ -175,6 +175,7 @@ int ieee802154_add_iface(struct sk_buff *skb, struct genl_info *info) 
	int rc = -ENOBUFS;

	struct net_device *dev;

	int type = __IEEE802154_DEV_INVALID;

	unsigned char name_assign_type;



	pr_debug("%s\n", __func__);
@@ -190,8 +191,10 @@ int ieee802154_add_iface(struct sk_buff *skb, struct genl_info *info) 
		if (devname[nla_len(info->attrs[IEEE802154_ATTR_DEV_NAME]) - 1]

				!= '\0')

			return -EINVAL; /* phy name should be null-terminated */

		name_assign_type = NET_NAME_USER;

	} else  {

		devname = "wpan%d";

		name_assign_type = NET_NAME_ENUM;

	}



	if (strlen(devname) >= IFNAMSIZ)
@@ -221,7 +224,7 @@ int ieee802154_add_iface(struct sk_buff *skb, struct genl_info *info) 
	}



	dev = rdev_add_virtual_intf_deprecated(wpan_phy_to_rdev(phy), devname,

					       type);

					       name_assign_type, type);

	if (IS_ERR(dev)) {

		rc = PTR_ERR(dev);

		goto nla_put_failure;

net/ieee802154/nl802154.c

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


	return rdev_add_virtual_intf(rdev,

				     nla_data(info->attrs[NL802154_ATTR_IFNAME]),

				     type, extended_addr);

				     NET_NAME_USER, type, extended_addr);

}



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

net/ieee802154/rdev-ops.h

+7 −3
Original line number Diff line number Diff line
@@ -8,10 +8,12 @@ 


static inline struct net_device *

rdev_add_virtual_intf_deprecated(struct cfg802154_registered_device *rdev,

				 const char *name, int type)

				 const char *name,

				 unsigned char name_assign_type,

				 int type)

{

	return rdev->ops->add_virtual_intf_deprecated(&rdev->wpan_phy, name,

						      type);

						      name_assign_type, type);

}



static inline void
@@ -23,13 +25,15 @@ rdev_del_virtual_intf_deprecated(struct cfg802154_registered_device *rdev, 


static inline int

rdev_add_virtual_intf(struct cfg802154_registered_device *rdev, char *name,

		      unsigned char name_assign_type,

		      enum nl802154_iftype type, __le64 extended_addr)

{

	int ret;



	trace_802154_rdev_add_virtual_intf(&rdev->wpan_phy, name, type,

					   extended_addr);

	ret = rdev->ops->add_virtual_intf(&rdev->wpan_phy, name, type,

	ret = rdev->ops->add_virtual_intf(&rdev->wpan_phy, name,

					  name_assign_type, type,

					  extended_addr);

	trace_802154_rdev_return_int(&rdev->wpan_phy, ret);

	return ret;

net/mac802154/cfg.c

+6 −3
Original line number Diff line number Diff line
@@ -22,13 +22,14 @@ 


static struct net_device *

ieee802154_add_iface_deprecated(struct wpan_phy *wpan_phy,

				const char *name, int type)

				const char *name,

				unsigned char name_assign_type, int type)

{

	struct ieee802154_local *local = wpan_phy_priv(wpan_phy);

	struct net_device *dev;



	rtnl_lock();

	dev = ieee802154_if_add(local, name, type,

	dev = ieee802154_if_add(local, name, name_assign_type, type,

				cpu_to_le64(0x0000000000000000ULL));

	rtnl_unlock();
@@ -45,12 +46,14 @@ static void ieee802154_del_iface_deprecated(struct wpan_phy *wpan_phy, 


static int

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

		     unsigned char name_assign_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, extended_addr);

	err = ieee802154_if_add(local, name, name_assign_type, type,

				extended_addr);

	return PTR_ERR_OR_ZERO(err);

}