mac802154: rename mac802154_sub_if_data
Like wireless this structure should named ieee802154_sub_if_data and not mac802154_sub_if_data. This patch renames the struct and variables to sdata instead priv sometimes. Signed-off-by: Alexander Aring <alex.aring@gmail.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
This commit is contained in:
Alexander Aring
zatwierdzone przez
Marcel Holtmann
Marcel Holtmann
rodzic
a5e1ec538f
commit
036562f9c4
@@ -38,11 +38,11 @@ struct hw_addr_filt_notify_work {
|
||||
|
||||
static struct ieee802154_local *mac802154_slave_get_priv(struct net_device *dev)
|
||||
{
|
||||
struct mac802154_sub_if_data *priv = netdev_priv(dev);
|
||||
struct ieee802154_sub_if_data *sdata = netdev_priv(dev);
|
||||
|
||||
BUG_ON(dev->type != ARPHRD_IEEE802154);
|
||||
|
||||
return priv->hw;
|
||||
return sdata->hw;
|
||||
}
|
||||
|
||||
static void hw_addr_notify(struct work_struct *work)
|
||||
@@ -62,7 +62,7 @@ static void hw_addr_notify(struct work_struct *work)
|
||||
|
||||
static void set_hw_addr_filt(struct net_device *dev, unsigned long changed)
|
||||
{
|
||||
struct mac802154_sub_if_data *priv = netdev_priv(dev);
|
||||
struct ieee802154_sub_if_data *sdata = netdev_priv(dev);
|
||||
struct hw_addr_filt_notify_work *work;
|
||||
|
||||
work = kzalloc(sizeof(*work), GFP_ATOMIC);
|
||||
@@ -72,92 +72,92 @@ static void set_hw_addr_filt(struct net_device *dev, unsigned long changed)
|
||||
INIT_WORK(&work->work, hw_addr_notify);
|
||||
work->dev = dev;
|
||||
work->changed = changed;
|
||||
queue_work(priv->hw->dev_workqueue, &work->work);
|
||||
queue_work(sdata->hw->dev_workqueue, &work->work);
|
||||
}
|
||||
|
||||
void mac802154_dev_set_short_addr(struct net_device *dev, __le16 val)
|
||||
{
|
||||
struct mac802154_sub_if_data *priv = netdev_priv(dev);
|
||||
struct ieee802154_sub_if_data *sdata = netdev_priv(dev);
|
||||
|
||||
BUG_ON(dev->type != ARPHRD_IEEE802154);
|
||||
|
||||
spin_lock_bh(&priv->mib_lock);
|
||||
priv->short_addr = val;
|
||||
spin_unlock_bh(&priv->mib_lock);
|
||||
spin_lock_bh(&sdata->mib_lock);
|
||||
sdata->short_addr = val;
|
||||
spin_unlock_bh(&sdata->mib_lock);
|
||||
|
||||
if ((priv->hw->ops->set_hw_addr_filt) &&
|
||||
(priv->hw->hw.hw_filt.short_addr != priv->short_addr)) {
|
||||
priv->hw->hw.hw_filt.short_addr = priv->short_addr;
|
||||
if ((sdata->hw->ops->set_hw_addr_filt) &&
|
||||
(sdata->hw->hw.hw_filt.short_addr != sdata->short_addr)) {
|
||||
sdata->hw->hw.hw_filt.short_addr = sdata->short_addr;
|
||||
set_hw_addr_filt(dev, IEEE802154_AFILT_SADDR_CHANGED);
|
||||
}
|
||||
}
|
||||
|
||||
__le16 mac802154_dev_get_short_addr(const struct net_device *dev)
|
||||
{
|
||||
struct mac802154_sub_if_data *priv = netdev_priv(dev);
|
||||
struct ieee802154_sub_if_data *sdata = netdev_priv(dev);
|
||||
__le16 ret;
|
||||
|
||||
BUG_ON(dev->type != ARPHRD_IEEE802154);
|
||||
|
||||
spin_lock_bh(&priv->mib_lock);
|
||||
ret = priv->short_addr;
|
||||
spin_unlock_bh(&priv->mib_lock);
|
||||
spin_lock_bh(&sdata->mib_lock);
|
||||
ret = sdata->short_addr;
|
||||
spin_unlock_bh(&sdata->mib_lock);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
void mac802154_dev_set_ieee_addr(struct net_device *dev)
|
||||
{
|
||||
struct mac802154_sub_if_data *priv = netdev_priv(dev);
|
||||
struct ieee802154_local *local = priv->hw;
|
||||
struct ieee802154_sub_if_data *sdata = netdev_priv(dev);
|
||||
struct ieee802154_local *local = sdata->hw;
|
||||
|
||||
priv->extended_addr = ieee802154_devaddr_from_raw(dev->dev_addr);
|
||||
sdata->extended_addr = ieee802154_devaddr_from_raw(dev->dev_addr);
|
||||
|
||||
if (local->ops->set_hw_addr_filt &&
|
||||
local->hw.hw_filt.ieee_addr != priv->extended_addr) {
|
||||
local->hw.hw_filt.ieee_addr = priv->extended_addr;
|
||||
local->hw.hw_filt.ieee_addr != sdata->extended_addr) {
|
||||
local->hw.hw_filt.ieee_addr = sdata->extended_addr;
|
||||
set_hw_addr_filt(dev, IEEE802154_AFILT_IEEEADDR_CHANGED);
|
||||
}
|
||||
}
|
||||
|
||||
__le16 mac802154_dev_get_pan_id(const struct net_device *dev)
|
||||
{
|
||||
struct mac802154_sub_if_data *priv = netdev_priv(dev);
|
||||
struct ieee802154_sub_if_data *sdata = netdev_priv(dev);
|
||||
__le16 ret;
|
||||
|
||||
BUG_ON(dev->type != ARPHRD_IEEE802154);
|
||||
|
||||
spin_lock_bh(&priv->mib_lock);
|
||||
ret = priv->pan_id;
|
||||
spin_unlock_bh(&priv->mib_lock);
|
||||
spin_lock_bh(&sdata->mib_lock);
|
||||
ret = sdata->pan_id;
|
||||
spin_unlock_bh(&sdata->mib_lock);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
void mac802154_dev_set_pan_id(struct net_device *dev, __le16 val)
|
||||
{
|
||||
struct mac802154_sub_if_data *priv = netdev_priv(dev);
|
||||
struct ieee802154_sub_if_data *sdata = netdev_priv(dev);
|
||||
|
||||
BUG_ON(dev->type != ARPHRD_IEEE802154);
|
||||
|
||||
spin_lock_bh(&priv->mib_lock);
|
||||
priv->pan_id = val;
|
||||
spin_unlock_bh(&priv->mib_lock);
|
||||
spin_lock_bh(&sdata->mib_lock);
|
||||
sdata->pan_id = val;
|
||||
spin_unlock_bh(&sdata->mib_lock);
|
||||
|
||||
if ((priv->hw->ops->set_hw_addr_filt) &&
|
||||
(priv->hw->hw.hw_filt.pan_id != priv->pan_id)) {
|
||||
priv->hw->hw.hw_filt.pan_id = priv->pan_id;
|
||||
if ((sdata->hw->ops->set_hw_addr_filt) &&
|
||||
(sdata->hw->hw.hw_filt.pan_id != sdata->pan_id)) {
|
||||
sdata->hw->hw.hw_filt.pan_id = sdata->pan_id;
|
||||
set_hw_addr_filt(dev, IEEE802154_AFILT_PANID_CHANGED);
|
||||
}
|
||||
}
|
||||
|
||||
u8 mac802154_dev_get_dsn(const struct net_device *dev)
|
||||
{
|
||||
struct mac802154_sub_if_data *priv = netdev_priv(dev);
|
||||
struct ieee802154_sub_if_data *sdata = netdev_priv(dev);
|
||||
|
||||
BUG_ON(dev->type != ARPHRD_IEEE802154);
|
||||
|
||||
return priv->dsn++;
|
||||
return sdata->dsn++;
|
||||
}
|
||||
|
||||
static void phy_chan_notify(struct work_struct *work)
|
||||
@@ -165,38 +165,38 @@ static void phy_chan_notify(struct work_struct *work)
|
||||
struct phy_chan_notify_work *nw = container_of(work,
|
||||
struct phy_chan_notify_work, work);
|
||||
struct ieee802154_local *local = mac802154_slave_get_priv(nw->dev);
|
||||
struct mac802154_sub_if_data *priv = netdev_priv(nw->dev);
|
||||
struct ieee802154_sub_if_data *sdata = netdev_priv(nw->dev);
|
||||
int res;
|
||||
|
||||
mutex_lock(&priv->hw->phy->pib_lock);
|
||||
res = local->ops->set_channel(&local->hw, priv->page, priv->chan);
|
||||
mutex_lock(&sdata->hw->phy->pib_lock);
|
||||
res = local->ops->set_channel(&local->hw, sdata->page, sdata->chan);
|
||||
if (res) {
|
||||
pr_debug("set_channel failed\n");
|
||||
} else {
|
||||
priv->hw->phy->current_channel = priv->chan;
|
||||
priv->hw->phy->current_page = priv->page;
|
||||
sdata->hw->phy->current_channel = sdata->chan;
|
||||
sdata->hw->phy->current_page = sdata->page;
|
||||
}
|
||||
mutex_unlock(&priv->hw->phy->pib_lock);
|
||||
mutex_unlock(&sdata->hw->phy->pib_lock);
|
||||
|
||||
kfree(nw);
|
||||
}
|
||||
|
||||
void mac802154_dev_set_page_channel(struct net_device *dev, u8 page, u8 chan)
|
||||
{
|
||||
struct mac802154_sub_if_data *priv = netdev_priv(dev);
|
||||
struct ieee802154_sub_if_data *sdata = netdev_priv(dev);
|
||||
struct phy_chan_notify_work *work;
|
||||
|
||||
BUG_ON(dev->type != ARPHRD_IEEE802154);
|
||||
|
||||
spin_lock_bh(&priv->mib_lock);
|
||||
priv->page = page;
|
||||
priv->chan = chan;
|
||||
spin_unlock_bh(&priv->mib_lock);
|
||||
spin_lock_bh(&sdata->mib_lock);
|
||||
sdata->page = page;
|
||||
sdata->chan = chan;
|
||||
spin_unlock_bh(&sdata->mib_lock);
|
||||
|
||||
mutex_lock(&priv->hw->phy->pib_lock);
|
||||
if (priv->hw->phy->current_channel != priv->chan ||
|
||||
priv->hw->phy->current_page != priv->page) {
|
||||
mutex_unlock(&priv->hw->phy->pib_lock);
|
||||
mutex_lock(&sdata->hw->phy->pib_lock);
|
||||
if (sdata->hw->phy->current_channel != sdata->chan ||
|
||||
sdata->hw->phy->current_page != sdata->page) {
|
||||
mutex_unlock(&sdata->hw->phy->pib_lock);
|
||||
|
||||
work = kzalloc(sizeof(*work), GFP_ATOMIC);
|
||||
if (!work)
|
||||
@@ -204,9 +204,9 @@ void mac802154_dev_set_page_channel(struct net_device *dev, u8 page, u8 chan)
|
||||
|
||||
INIT_WORK(&work->work, phy_chan_notify);
|
||||
work->dev = dev;
|
||||
queue_work(priv->hw->dev_workqueue, &work->work);
|
||||
queue_work(sdata->hw->dev_workqueue, &work->work);
|
||||
} else {
|
||||
mutex_unlock(&priv->hw->phy->pib_lock);
|
||||
mutex_unlock(&sdata->hw->phy->pib_lock);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -214,14 +214,14 @@ void mac802154_dev_set_page_channel(struct net_device *dev, u8 page, u8 chan)
|
||||
int mac802154_get_params(struct net_device *dev,
|
||||
struct ieee802154_llsec_params *params)
|
||||
{
|
||||
struct mac802154_sub_if_data *priv = netdev_priv(dev);
|
||||
struct ieee802154_sub_if_data *sdata = 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);
|
||||
mutex_lock(&sdata->sec_mtx);
|
||||
res = mac802154_llsec_get_params(&sdata->sec, params);
|
||||
mutex_unlock(&sdata->sec_mtx);
|
||||
|
||||
return res;
|
||||
}
|
||||
@@ -230,14 +230,14 @@ 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);
|
||||
struct ieee802154_sub_if_data *sdata = 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);
|
||||
mutex_lock(&sdata->sec_mtx);
|
||||
res = mac802154_llsec_set_params(&sdata->sec, params, changed);
|
||||
mutex_unlock(&sdata->sec_mtx);
|
||||
|
||||
return res;
|
||||
}
|
||||
@@ -247,14 +247,14 @@ 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);
|
||||
struct ieee802154_sub_if_data *sdata = 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);
|
||||
mutex_lock(&sdata->sec_mtx);
|
||||
res = mac802154_llsec_key_add(&sdata->sec, id, key);
|
||||
mutex_unlock(&sdata->sec_mtx);
|
||||
|
||||
return res;
|
||||
}
|
||||
@@ -262,14 +262,14 @@ int mac802154_add_key(struct net_device *dev,
|
||||
int mac802154_del_key(struct net_device *dev,
|
||||
const struct ieee802154_llsec_key_id *id)
|
||||
{
|
||||
struct mac802154_sub_if_data *priv = netdev_priv(dev);
|
||||
struct ieee802154_sub_if_data *sdata = 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);
|
||||
mutex_lock(&sdata->sec_mtx);
|
||||
res = mac802154_llsec_key_del(&sdata->sec, id);
|
||||
mutex_unlock(&sdata->sec_mtx);
|
||||
|
||||
return res;
|
||||
}
|
||||
@@ -278,28 +278,28 @@ int mac802154_del_key(struct net_device *dev,
|
||||
int mac802154_add_dev(struct net_device *dev,
|
||||
const struct ieee802154_llsec_device *llsec_dev)
|
||||
{
|
||||
struct mac802154_sub_if_data *priv = netdev_priv(dev);
|
||||
struct ieee802154_sub_if_data *sdata = 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);
|
||||
mutex_lock(&sdata->sec_mtx);
|
||||
res = mac802154_llsec_dev_add(&sdata->sec, llsec_dev);
|
||||
mutex_unlock(&sdata->sec_mtx);
|
||||
|
||||
return res;
|
||||
}
|
||||
|
||||
int mac802154_del_dev(struct net_device *dev, __le64 dev_addr)
|
||||
{
|
||||
struct mac802154_sub_if_data *priv = netdev_priv(dev);
|
||||
struct ieee802154_sub_if_data *sdata = 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);
|
||||
mutex_lock(&sdata->sec_mtx);
|
||||
res = mac802154_llsec_dev_del(&sdata->sec, dev_addr);
|
||||
mutex_unlock(&sdata->sec_mtx);
|
||||
|
||||
return res;
|
||||
}
|
||||
@@ -309,14 +309,14 @@ 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);
|
||||
struct ieee802154_sub_if_data *sdata = 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);
|
||||
mutex_lock(&sdata->sec_mtx);
|
||||
res = mac802154_llsec_devkey_add(&sdata->sec, device_addr, key);
|
||||
mutex_unlock(&sdata->sec_mtx);
|
||||
|
||||
return res;
|
||||
}
|
||||
@@ -325,14 +325,14 @@ 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);
|
||||
struct ieee802154_sub_if_data *sdata = 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);
|
||||
mutex_lock(&sdata->sec_mtx);
|
||||
res = mac802154_llsec_devkey_del(&sdata->sec, device_addr, key);
|
||||
mutex_unlock(&sdata->sec_mtx);
|
||||
|
||||
return res;
|
||||
}
|
||||
@@ -341,14 +341,14 @@ int mac802154_del_devkey(struct net_device *dev,
|
||||
int mac802154_add_seclevel(struct net_device *dev,
|
||||
const struct ieee802154_llsec_seclevel *sl)
|
||||
{
|
||||
struct mac802154_sub_if_data *priv = netdev_priv(dev);
|
||||
struct ieee802154_sub_if_data *sdata = 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);
|
||||
mutex_lock(&sdata->sec_mtx);
|
||||
res = mac802154_llsec_seclevel_add(&sdata->sec, sl);
|
||||
mutex_unlock(&sdata->sec_mtx);
|
||||
|
||||
return res;
|
||||
}
|
||||
@@ -356,14 +356,14 @@ int mac802154_add_seclevel(struct net_device *dev,
|
||||
int mac802154_del_seclevel(struct net_device *dev,
|
||||
const struct ieee802154_llsec_seclevel *sl)
|
||||
{
|
||||
struct mac802154_sub_if_data *priv = netdev_priv(dev);
|
||||
struct ieee802154_sub_if_data *sdata = 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);
|
||||
mutex_lock(&sdata->sec_mtx);
|
||||
res = mac802154_llsec_seclevel_del(&sdata->sec, sl);
|
||||
mutex_unlock(&sdata->sec_mtx);
|
||||
|
||||
return res;
|
||||
}
|
||||
@@ -371,28 +371,28 @@ int mac802154_del_seclevel(struct net_device *dev,
|
||||
|
||||
void mac802154_lock_table(struct net_device *dev)
|
||||
{
|
||||
struct mac802154_sub_if_data *priv = netdev_priv(dev);
|
||||
struct ieee802154_sub_if_data *sdata = netdev_priv(dev);
|
||||
|
||||
BUG_ON(dev->type != ARPHRD_IEEE802154);
|
||||
|
||||
mutex_lock(&priv->sec_mtx);
|
||||
mutex_lock(&sdata->sec_mtx);
|
||||
}
|
||||
|
||||
void mac802154_get_table(struct net_device *dev,
|
||||
struct ieee802154_llsec_table **t)
|
||||
{
|
||||
struct mac802154_sub_if_data *priv = netdev_priv(dev);
|
||||
struct ieee802154_sub_if_data *sdata = netdev_priv(dev);
|
||||
|
||||
BUG_ON(dev->type != ARPHRD_IEEE802154);
|
||||
|
||||
*t = &priv->sec.table;
|
||||
*t = &sdata->sec.table;
|
||||
}
|
||||
|
||||
void mac802154_unlock_table(struct net_device *dev)
|
||||
{
|
||||
struct mac802154_sub_if_data *priv = netdev_priv(dev);
|
||||
struct ieee802154_sub_if_data *sdata = netdev_priv(dev);
|
||||
|
||||
BUG_ON(dev->type != ARPHRD_IEEE802154);
|
||||
|
||||
mutex_unlock(&priv->sec_mtx);
|
||||
mutex_unlock(&sdata->sec_mtx);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user