Commit f7730542 authored by Alexander Aring's avatar Alexander Aring Committed by Marcel Holtmann

mac802154: rename dev_workqueue to workqueue

Small rename to use the name workqueue than dev_workqueue. To bring the
same naming convention like wireless into 802.15.4.
Signed-off-by: default avatarAlexander Aring <alex.aring@gmail.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 59d19cd7
...@@ -48,7 +48,7 @@ struct ieee802154_local { ...@@ -48,7 +48,7 @@ struct ieee802154_local {
/* This one is used for scanning and other jobs not to be interfered /* This one is used for scanning and other jobs not to be interfered
* with serial driver. * with serial driver.
*/ */
struct workqueue_struct *dev_workqueue; struct workqueue_struct *workqueue;
/* SoftMAC device is registered and running. One can add subinterfaces. /* SoftMAC device is registered and running. One can add subinterfaces.
* This flag should be modified under slaves_mtx and RTNL, so you can * This flag should be modified under slaves_mtx and RTNL, so you can
......
...@@ -343,9 +343,9 @@ int ieee802154_register_hw(struct ieee802154_hw *hw) ...@@ -343,9 +343,9 @@ int ieee802154_register_hw(struct ieee802154_hw *hw)
local->phy->set_frame_retries = mac802154_set_frame_retries; local->phy->set_frame_retries = mac802154_set_frame_retries;
} }
local->dev_workqueue = local->workqueue =
create_singlethread_workqueue(wpan_phy_name(local->phy)); create_singlethread_workqueue(wpan_phy_name(local->phy));
if (!local->dev_workqueue) { if (!local->workqueue) {
rc = -ENOMEM; rc = -ENOMEM;
goto out; goto out;
} }
...@@ -370,7 +370,7 @@ int ieee802154_register_hw(struct ieee802154_hw *hw) ...@@ -370,7 +370,7 @@ int ieee802154_register_hw(struct ieee802154_hw *hw)
return 0; return 0;
out_wq: out_wq:
destroy_workqueue(local->dev_workqueue); destroy_workqueue(local->workqueue);
out: out:
return rc; return rc;
} }
...@@ -381,8 +381,8 @@ void ieee802154_unregister_hw(struct ieee802154_hw *hw) ...@@ -381,8 +381,8 @@ void ieee802154_unregister_hw(struct ieee802154_hw *hw)
struct ieee802154_local *local = hw_to_local(hw); struct ieee802154_local *local = hw_to_local(hw);
struct ieee802154_sub_if_data *sdata, *next; struct ieee802154_sub_if_data *sdata, *next;
flush_workqueue(local->dev_workqueue); flush_workqueue(local->workqueue);
destroy_workqueue(local->dev_workqueue); destroy_workqueue(local->workqueue);
rtnl_lock(); rtnl_lock();
......
...@@ -72,7 +72,7 @@ static void set_hw_addr_filt(struct net_device *dev, unsigned long changed) ...@@ -72,7 +72,7 @@ static void set_hw_addr_filt(struct net_device *dev, unsigned long changed)
INIT_WORK(&work->work, hw_addr_notify); INIT_WORK(&work->work, hw_addr_notify);
work->dev = dev; work->dev = dev;
work->changed = changed; work->changed = changed;
queue_work(sdata->local->dev_workqueue, &work->work); queue_work(sdata->local->workqueue, &work->work);
} }
void mac802154_dev_set_short_addr(struct net_device *dev, __le16 val) void mac802154_dev_set_short_addr(struct net_device *dev, __le16 val)
...@@ -205,7 +205,7 @@ void mac802154_dev_set_page_channel(struct net_device *dev, u8 page, u8 chan) ...@@ -205,7 +205,7 @@ void mac802154_dev_set_page_channel(struct net_device *dev, u8 page, u8 chan)
INIT_WORK(&work->work, phy_chan_notify); INIT_WORK(&work->work, phy_chan_notify);
work->dev = dev; work->dev = dev;
queue_work(sdata->local->dev_workqueue, &work->work); queue_work(sdata->local->workqueue, &work->work);
} else { } else {
mutex_unlock(&sdata->local->phy->pib_lock); mutex_unlock(&sdata->local->phy->pib_lock);
} }
......
...@@ -105,6 +105,6 @@ ieee802154_rx_irqsafe(struct ieee802154_hw *hw, struct sk_buff *skb, u8 lqi) ...@@ -105,6 +105,6 @@ ieee802154_rx_irqsafe(struct ieee802154_hw *hw, struct sk_buff *skb, u8 lqi)
work->hw = hw; work->hw = hw;
work->lqi = lqi; work->lqi = lqi;
queue_work(local->dev_workqueue, &work->work); queue_work(local->workqueue, &work->work);
} }
EXPORT_SYMBOL(ieee802154_rx_irqsafe); EXPORT_SYMBOL(ieee802154_rx_irqsafe);
...@@ -119,7 +119,7 @@ netdev_tx_t mac802154_tx(struct ieee802154_local *local, struct sk_buff *skb, ...@@ -119,7 +119,7 @@ netdev_tx_t mac802154_tx(struct ieee802154_local *local, struct sk_buff *skb,
work->page = page; work->page = page;
work->chan = chan; work->chan = chan;
queue_work(local->dev_workqueue, &work->work); queue_work(local->workqueue, &work->work);
return NETDEV_TX_OK; return NETDEV_TX_OK;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment