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

Commit 7c118c1a authored by Alexander Aring's avatar Alexander Aring Committed by Marcel Holtmann
Browse files

mac802154: add ieee802154_vif struct 



This patch adds an ieee802154_vif similar like the ieee80211_vif which
holds the interface type and maybe further more attributes like the
ieee80211_vif structure.

Signed-off-by: default avatarAlexander Aring <alex.aring@gmail.com>
Cc: Varka Bhadram <varkabhadram@gmail.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent e4962a14

drivers/net/ieee802154/at86rf230.c

+1 −0
Original line number Diff line number Diff line
@@ -1533,6 +1533,7 @@ static int at86rf230_probe(struct spi_device *spi) 
	lp->hw = hw;

	lp->spi = spi;

	hw->parent = &spi->dev;

	hw->vif_data_size = sizeof(*lp);



	lp->regmap = devm_regmap_init_spi(spi, &at86rf230_regmap_spi_config);

	if (IS_ERR(lp->regmap)) {

drivers/net/ieee802154/cc2520.c

+1 −0
Original line number Diff line number Diff line
@@ -651,6 +651,7 @@ static int cc2520_register(struct cc2520_private *priv) 
	priv->hw->priv = priv;

	priv->hw->parent = &priv->spi->dev;

	priv->hw->extra_tx_headroom = 0;

	priv->hw->vif_data_size = sizeof(*priv);



	/* We do support only 2.4 Ghz */

	priv->hw->phy->channels_supported[0] = 0x7FFF800;

include/net/mac802154.h

+8 −0
Original line number Diff line number Diff line
@@ -52,6 +52,13 @@ struct ieee802154_hw_addr_filt { 
	u8	pan_coord;

};



struct ieee802154_vif {

	int type;



	/* must be last */

	u8 drv_priv[0] __aligned(sizeof(void *));

};



struct ieee802154_hw {

	/* filled by the driver */

	int	extra_tx_headroom;
@@ -62,6 +69,7 @@ struct ieee802154_hw { 
	struct	ieee802154_hw_addr_filt hw_filt;

	void	*priv;

	struct	wpan_phy *phy;

	size_t vif_data_size;

};



/* Checksum is in hardware and is omitted from a packet

net/mac802154/ieee802154_i.h

+2 −1
Original line number Diff line number Diff line
@@ -79,7 +79,6 @@ struct ieee802154_sub_if_data { 
	struct ieee802154_local *local;

	struct net_device *dev;



	int type;

	unsigned long state;

	char name[IFNAMSIZ];
@@ -103,6 +102,8 @@ struct ieee802154_sub_if_data { 
	struct mutex sec_mtx;



	struct mac802154_llsec sec;

	/* must be last, dynamically sized area in this! */

	struct ieee802154_vif vif;

};



#define MAC802154_CHAN_NONE		0xff /* No channel is assigned */

net/mac802154/iface.c

+6 −5
Original line number Diff line number Diff line
@@ -136,10 +136,11 @@ static int mac802154_slave_open(struct net_device *dev) 


	ASSERT_RTNL();



	if (sdata->type == IEEE802154_DEV_WPAN) {

	if (sdata->vif.type == IEEE802154_DEV_WPAN) {

		mutex_lock(&sdata->local->iflist_mtx);

		list_for_each_entry(subif, &sdata->local->interfaces, list) {

			if (subif != sdata && subif->type == sdata->type &&

			if (subif != sdata &&

			    subif->vif.type == sdata->vif.type &&

			    ieee802154_sdata_running(subif)) {

				mutex_unlock(&sdata->local->iflist_mtx);

				return -EBUSY;
@@ -397,7 +398,7 @@ static int 
ieee802154_setup_sdata(struct ieee802154_sub_if_data *sdata, int type)

{

	/* set some type-dependent values */

	sdata->type = type;

	sdata->vif.type = type;



	get_random_bytes(&sdata->bsn, 1);

	get_random_bytes(&sdata->dsn, 1);
@@ -447,8 +448,8 @@ ieee802154_if_add(struct ieee802154_local *local, const char *name, 


	ASSERT_RTNL();



	ndev = alloc_netdev(sizeof(*sdata), name, NET_NAME_UNKNOWN,

			    ieee802154_if_setup);

	ndev = alloc_netdev(sizeof(*sdata) + local->hw.vif_data_size, name,

			    NET_NAME_UNKNOWN, ieee802154_if_setup);

	if (!ndev)

		return ERR_PTR(-ENOMEM);