diff options
Diffstat (limited to 'net/mac802154/mib.c')
| -rw-r--r-- | net/mac802154/mib.c | 212 | 
1 files changed, 198 insertions, 14 deletions
diff --git a/net/mac802154/mib.c b/net/mac802154/mib.c index 8ded97cf1c3..15aa2f2b03a 100644 --- a/net/mac802154/mib.c +++ b/net/mac802154/mib.c @@ -24,6 +24,7 @@  #include <linux/if_arp.h>  #include <net/mac802154.h> +#include <net/ieee802154_netdev.h>  #include <net/wpan-phy.h>  #include "mac802154.h" @@ -62,8 +63,6 @@ static void hw_addr_notify(struct work_struct *work)  		pr_debug("failed changed mask %lx\n", nw->changed);  	kfree(nw); - -	return;  }  static void set_hw_addr_filt(struct net_device *dev, unsigned long changed) @@ -79,11 +78,9 @@ static void set_hw_addr_filt(struct net_device *dev, unsigned long changed)  	work->dev = dev;  	work->changed = changed;  	queue_work(priv->hw->dev_workqueue, &work->work); - -	return;  } -void mac802154_dev_set_short_addr(struct net_device *dev, u16 val) +void mac802154_dev_set_short_addr(struct net_device *dev, __le16 val)  {  	struct mac802154_sub_if_data *priv = netdev_priv(dev); @@ -100,10 +97,10 @@ void mac802154_dev_set_short_addr(struct net_device *dev, u16 val)  	}  } -u16 mac802154_dev_get_short_addr(const struct net_device *dev) +__le16 mac802154_dev_get_short_addr(const struct net_device *dev)  {  	struct mac802154_sub_if_data *priv = netdev_priv(dev); -	u16 ret; +	__le16 ret;  	BUG_ON(dev->type != ARPHRD_IEEE802154); @@ -119,19 +116,19 @@ void mac802154_dev_set_ieee_addr(struct net_device *dev)  	struct mac802154_sub_if_data *priv = netdev_priv(dev);  	struct mac802154_priv *mac = priv->hw; +	priv->extended_addr = ieee802154_devaddr_from_raw(dev->dev_addr); +  	if (mac->ops->set_hw_addr_filt && -	    memcmp(mac->hw.hw_filt.ieee_addr, -		   dev->dev_addr, IEEE802154_ADDR_LEN)) { -		memcpy(mac->hw.hw_filt.ieee_addr, -		       dev->dev_addr, IEEE802154_ADDR_LEN); +	    mac->hw.hw_filt.ieee_addr != priv->extended_addr) { +		mac->hw.hw_filt.ieee_addr = priv->extended_addr;  		set_hw_addr_filt(dev, IEEE802515_AFILT_IEEEADDR_CHANGED);  	}  } -u16 mac802154_dev_get_pan_id(const struct net_device *dev) +__le16 mac802154_dev_get_pan_id(const struct net_device *dev)  {  	struct mac802154_sub_if_data *priv = netdev_priv(dev); -	u16 ret; +	__le16 ret;  	BUG_ON(dev->type != ARPHRD_IEEE802154); @@ -142,7 +139,7 @@ u16 mac802154_dev_get_pan_id(const struct net_device *dev)  	return ret;  } -void mac802154_dev_set_pan_id(struct net_device *dev, u16 val) +void mac802154_dev_set_pan_id(struct net_device *dev, __le16 val)  {  	struct mac802154_sub_if_data *priv = netdev_priv(dev); @@ -216,3 +213,190 @@ void mac802154_dev_set_page_channel(struct net_device *dev, u8 page, u8 chan)  	} else  		mutex_unlock(&priv->hw->phy->pib_lock);  } + + +int mac802154_get_params(struct net_device *dev, +			 struct ieee802154_llsec_params *params) +{ +	struct mac802154_sub_if_data *priv = netdev_priv(dev); +	int res; + +	BUG_ON(dev->type != ARPHRD_IEEE802154); + +	mutex_lock(&priv->sec_mtx); +	res = mac802154_llsec_get_params(&priv->sec, params); +	mutex_unlock(&priv->sec_mtx); + +	return res; +} + +int mac802154_set_params(struct net_device *dev, +			 const struct ieee802154_llsec_params *params, +			 int changed) +{ +	struct mac802154_sub_if_data *priv = netdev_priv(dev); +	int res; + +	BUG_ON(dev->type != ARPHRD_IEEE802154); + +	mutex_lock(&priv->sec_mtx); +	res = mac802154_llsec_set_params(&priv->sec, params, changed); +	mutex_unlock(&priv->sec_mtx); + +	return res; +} + + +int mac802154_add_key(struct net_device *dev, +		      const struct ieee802154_llsec_key_id *id, +		      const struct ieee802154_llsec_key *key) +{ +	struct mac802154_sub_if_data *priv = netdev_priv(dev); +	int res; + +	BUG_ON(dev->type != ARPHRD_IEEE802154); + +	mutex_lock(&priv->sec_mtx); +	res = mac802154_llsec_key_add(&priv->sec, id, key); +	mutex_unlock(&priv->sec_mtx); + +	return res; +} + +int mac802154_del_key(struct net_device *dev, +		      const struct ieee802154_llsec_key_id *id) +{ +	struct mac802154_sub_if_data *priv = netdev_priv(dev); +	int res; + +	BUG_ON(dev->type != ARPHRD_IEEE802154); + +	mutex_lock(&priv->sec_mtx); +	res = mac802154_llsec_key_del(&priv->sec, id); +	mutex_unlock(&priv->sec_mtx); + +	return res; +} + + +int mac802154_add_dev(struct net_device *dev, +		      const struct ieee802154_llsec_device *llsec_dev) +{ +	struct mac802154_sub_if_data *priv = netdev_priv(dev); +	int res; + +	BUG_ON(dev->type != ARPHRD_IEEE802154); + +	mutex_lock(&priv->sec_mtx); +	res = mac802154_llsec_dev_add(&priv->sec, llsec_dev); +	mutex_unlock(&priv->sec_mtx); + +	return res; +} + +int mac802154_del_dev(struct net_device *dev, __le64 dev_addr) +{ +	struct mac802154_sub_if_data *priv = netdev_priv(dev); +	int res; + +	BUG_ON(dev->type != ARPHRD_IEEE802154); + +	mutex_lock(&priv->sec_mtx); +	res = mac802154_llsec_dev_del(&priv->sec, dev_addr); +	mutex_unlock(&priv->sec_mtx); + +	return res; +} + + +int mac802154_add_devkey(struct net_device *dev, +			 __le64 device_addr, +			 const struct ieee802154_llsec_device_key *key) +{ +	struct mac802154_sub_if_data *priv = netdev_priv(dev); +	int res; + +	BUG_ON(dev->type != ARPHRD_IEEE802154); + +	mutex_lock(&priv->sec_mtx); +	res = mac802154_llsec_devkey_add(&priv->sec, device_addr, key); +	mutex_unlock(&priv->sec_mtx); + +	return res; +} + +int mac802154_del_devkey(struct net_device *dev, +			 __le64 device_addr, +			 const struct ieee802154_llsec_device_key *key) +{ +	struct mac802154_sub_if_data *priv = netdev_priv(dev); +	int res; + +	BUG_ON(dev->type != ARPHRD_IEEE802154); + +	mutex_lock(&priv->sec_mtx); +	res = mac802154_llsec_devkey_del(&priv->sec, device_addr, key); +	mutex_unlock(&priv->sec_mtx); + +	return res; +} + + +int mac802154_add_seclevel(struct net_device *dev, +			   const struct ieee802154_llsec_seclevel *sl) +{ +	struct mac802154_sub_if_data *priv = netdev_priv(dev); +	int res; + +	BUG_ON(dev->type != ARPHRD_IEEE802154); + +	mutex_lock(&priv->sec_mtx); +	res = mac802154_llsec_seclevel_add(&priv->sec, sl); +	mutex_unlock(&priv->sec_mtx); + +	return res; +} + +int mac802154_del_seclevel(struct net_device *dev, +			   const struct ieee802154_llsec_seclevel *sl) +{ +	struct mac802154_sub_if_data *priv = netdev_priv(dev); +	int res; + +	BUG_ON(dev->type != ARPHRD_IEEE802154); + +	mutex_lock(&priv->sec_mtx); +	res = mac802154_llsec_seclevel_del(&priv->sec, sl); +	mutex_unlock(&priv->sec_mtx); + +	return res; +} + + +void mac802154_lock_table(struct net_device *dev) +{ +	struct mac802154_sub_if_data *priv = netdev_priv(dev); + +	BUG_ON(dev->type != ARPHRD_IEEE802154); + +	mutex_lock(&priv->sec_mtx); +} + +void mac802154_get_table(struct net_device *dev, +			 struct ieee802154_llsec_table **t) +{ +	struct mac802154_sub_if_data *priv = netdev_priv(dev); + +	BUG_ON(dev->type != ARPHRD_IEEE802154); + +	*t = &priv->sec.table; +} + +void mac802154_unlock_table(struct net_device *dev) +{ +	struct mac802154_sub_if_data *priv = netdev_priv(dev); + +	BUG_ON(dev->type != ARPHRD_IEEE802154); + +	mutex_unlock(&priv->sec_mtx); +}  | 
