aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac802154/iface.c
diff options
context:
space:
mode:
authorAlexander Aring <alex.aring@gmail.com>2014-10-28 13:21:29 -0400
committerMarcel Holtmann <marcel@holtmann.org>2014-10-28 18:19:08 -0400
commit12439a53560097bc8e42cf14967717d14588dddd (patch)
tree34a1bf967900cb2ca32e32eb4a9eb07a422ad079 /net/mac802154/iface.c
parent33d4189f51f0dbb522a4d81aafc7edb2e048c570 (diff)
mac802154: remove channel attributes from sdata
These channel attributes was part of "channel context switch while xmit" which was removed by commit dc67c6b30f36d57b70b70547a30e7a8432540c6f ("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>
Diffstat (limited to 'net/mac802154/iface.c')
-rw-r--r--net/mac802154/iface.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/net/mac802154/iface.c b/net/mac802154/iface.c
index 2423aa7671df..1c0274ed9370 100644
--- a/net/mac802154/iface.c
+++ b/net/mac802154/iface.c
@@ -417,8 +417,6 @@ void mac802154_wpan_setup(struct net_device *dev)
417 sdata = IEEE802154_DEV_TO_SUB_IF(dev); 417 sdata = IEEE802154_DEV_TO_SUB_IF(dev);
418 sdata->type = IEEE802154_DEV_WPAN; 418 sdata->type = IEEE802154_DEV_WPAN;
419 419
420 sdata->chan = MAC802154_CHAN_NONE;
421
422 spin_lock_init(&sdata->mib_lock); 420 spin_lock_init(&sdata->mib_lock);
423 mutex_init(&sdata->sec_mtx); 421 mutex_init(&sdata->sec_mtx);
424 422
@@ -454,6 +452,4 @@ void mac802154_monitor_setup(struct net_device *dev)
454 452
455 sdata = IEEE802154_DEV_TO_SUB_IF(dev); 453 sdata = IEEE802154_DEV_TO_SUB_IF(dev);
456 sdata->type = IEEE802154_DEV_MONITOR; 454 sdata->type = IEEE802154_DEV_MONITOR;
457
458 sdata->chan = MAC802154_CHAN_NONE; /* not initialized */
459} 455}