evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mac802154: remove channel attributes from sdata

Browse source 
These channel attributes was part of "channel context switch while xmit"
which was removed by commit dc67c6b30f
("mac802154: tx: remove xmit channel context switch"). This patch
removes these unnecessary variables and use the current_page and
current_channel by wpan_phy struct now.

Signed-off-by: Alexander Aring <alex.aring@gmail.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
This commit is contained in:
Alexander Aring 2014-10-28 18:21:29 +01:00 • committed by Marcel Holtmann
parent 33d4189f51
commit 12439a5356
3 changed files with 9 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
net/mac802154/ieee802154_i.h
View file

@ -85,9 +85,6 @@ struct ieee802154_sub_if_data {
__le16 short_addr; __le16 short_addr;
__le64 extended_addr; __le64 extended_addr;
u8 chan;
u8 page;
struct ieee802154_mac_params mac_params; struct ieee802154_mac_params mac_params;
/* MAC BSN field */ /* MAC BSN field */

4
net/mac802154/iface.c
View file

@ -417,8 +417,6 @@ void mac802154_wpan_setup(struct net_device *dev)
sdata = IEEE802154_DEV_TO_SUB_IF(dev); sdata = IEEE802154_DEV_TO_SUB_IF(dev);
sdata->type = IEEE802154_DEV_WPAN; sdata->type = IEEE802154_DEV_WPAN;
sdata->chan = MAC802154_CHAN_NONE;
spin_lock_init(&sdata->mib_lock); spin_lock_init(&sdata->mib_lock);
mutex_init(&sdata->sec_mtx); mutex_init(&sdata->sec_mtx);
@ -454,6 +452,4 @@ void mac802154_monitor_setup(struct net_device *dev)
sdata = IEEE802154_DEV_TO_SUB_IF(dev); sdata = IEEE802154_DEV_TO_SUB_IF(dev);
sdata->type = IEEE802154_DEV_MONITOR; sdata->type = IEEE802154_DEV_MONITOR;
sdata->chan = MAC802154_CHAN_NONE; /* not initialized */
} }

55
net/mac802154/mib.c
View file

@ -26,11 +26,6 @@
#include "ieee802154_i.h" #include "ieee802154_i.h"
#include "driver-ops.h" #include "driver-ops.h"
struct phy_chan_notify_work {
struct work_struct work;
struct net_device *dev;
};
struct hw_addr_filt_notify_work { struct hw_addr_filt_notify_work {
struct work_struct work; struct work_struct work;
struct net_device *dev; struct net_device *dev;
@ -161,54 +156,22 @@ u8 mac802154_dev_get_dsn(const struct net_device *dev)
return sdata->dsn++; return sdata->dsn++;
} }
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 net_device *dev = nw->dev;
struct ieee802154_local *local = mac802154_slave_get_priv(dev);
struct ieee802154_sub_if_data *sdata = IEEE802154_DEV_TO_SUB_IF(dev);
int res;
mutex_lock(&sdata->local->phy->pib_lock);
res = drv_set_channel(local, sdata->page, sdata->chan);
if (res) {
pr_debug("set_channel failed\n");
} else {
sdata->local->phy->current_channel = sdata->chan;
sdata->local->phy->current_page = sdata->page;
}
mutex_unlock(&sdata->local->phy->pib_lock);
kfree(nw);
}
void mac802154_dev_set_page_channel(struct net_device *dev, u8 page, u8 chan) void mac802154_dev_set_page_channel(struct net_device *dev, u8 page, u8 chan)
{ {
struct ieee802154_sub_if_data *sdata = IEEE802154_DEV_TO_SUB_IF(dev); struct ieee802154_sub_if_data *sdata = IEEE802154_DEV_TO_SUB_IF(dev);
struct phy_chan_notify_work *work; struct ieee802154_local *local = sdata->local;
int res;
BUG_ON(dev->type != ARPHRD_IEEE802154); BUG_ON(dev->type != ARPHRD_IEEE802154);
spin_lock_bh(&sdata->mib_lock); res = drv_set_channel(local, page, chan);
sdata->page = page; if (res) {
sdata->chan = chan; pr_debug("set_channel failed\n");
spin_unlock_bh(&sdata->mib_lock);
mutex_lock(&sdata->local->phy->pib_lock);
if (sdata->local->phy->current_channel != sdata->chan ||
sdata->local->phy->current_page != sdata->page) {
mutex_unlock(&sdata->local->phy->pib_lock);
work = kzalloc(sizeof(*work), GFP_ATOMIC);
if (!work)
return;
INIT_WORK(&work->work, phy_chan_notify);
work->dev = dev;
queue_work(sdata->local->workqueue, &work->work);
} else { } else {
mutex_unlock(&sdata->local->phy->pib_lock); mutex_lock(&local->phy->pib_lock);
local->phy->current_channel = chan;
local->phy->current_page = page;
mutex_unlock(&local->phy->pib_lock);
} }
} }