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

Commit e885a47a authored by alex.bluesman.smirnov@gmail.com's avatar alex.bluesman.smirnov@gmail.com Committed by David S. Miller
Browse files

mac802154: add get short address method 



Add method to get the device short 802.15.4 address. This call
needed by ieee802154 layer to satisfy 'iz list' request from
the user space.

Signed-off-by: default avatarAlexander Smirnov <alex.bluesman.smirnov@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5b00f2ee

net/mac802154/mac802154.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -109,6 +109,7 @@ netdev_tx_t mac802154_tx(struct mac802154_priv *priv, struct sk_buff *skb, 




/* MIB callbacks */

/* MIB callbacks */

void mac802154_dev_set_short_addr(struct net_device *dev, u16 val);

void mac802154_dev_set_short_addr(struct net_device *dev, u16 val);

u16 mac802154_dev_get_short_addr(const struct net_device *dev);

void mac802154_dev_set_ieee_addr(struct net_device *dev);

void mac802154_dev_set_ieee_addr(struct net_device *dev);

u16 mac802154_dev_get_pan_id(const struct net_device *dev);

u16 mac802154_dev_get_pan_id(const struct net_device *dev);

void mac802154_dev_set_pan_id(struct net_device *dev, u16 val);

void mac802154_dev_set_pan_id(struct net_device *dev, u16 val);

net/mac802154/mac_cmd.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -71,4 +71,6 @@ struct ieee802154_reduced_mlme_ops mac802154_mlme_reduced = { 
struct ieee802154_mlme_ops mac802154_mlme_wpan = {

struct ieee802154_mlme_ops mac802154_mlme_wpan = {

	.get_phy = mac802154_get_phy,

	.get_phy = mac802154_get_phy,

	.start_req = mac802154_mlme_start_req,

	.start_req = mac802154_mlme_start_req,

	.get_pan_id = mac802154_dev_get_pan_id,

	.get_short_addr = mac802154_dev_get_short_addr,

};
 
};

net/mac802154/mib.c

+14 −0
Original line number Original line Diff line number Diff line
@@ -100,6 +100,20 @@ void mac802154_dev_set_short_addr(struct net_device *dev, u16 val) 
	}

	}

}

}





u16 mac802154_dev_get_short_addr(const struct net_device *dev)

{

	struct mac802154_sub_if_data *priv = netdev_priv(dev);

	u16 ret;



	BUG_ON(dev->type != ARPHRD_IEEE802154);



	spin_lock_bh(&priv->mib_lock);

	ret = priv->short_addr;

	spin_unlock_bh(&priv->mib_lock);



	return ret;

}



void mac802154_dev_set_ieee_addr(struct net_device *dev)

void mac802154_dev_set_ieee_addr(struct net_device *dev)

{

{

	struct mac802154_sub_if_data *priv = netdev_priv(dev);

	struct mac802154_sub_if_data *priv = netdev_priv(dev);