AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

mac802154: rename dev_workqueue to workqueue

Browse Source 
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: Alexander Aring <alex.aring@gmail.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
This commit is contained in:
Alexander Aring 2014-10-25 17:16:41 +02:00 committed by Marcel Holtmann
parent 59d19cd70c
commit f773054254
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/mac802154/ieee802154_i.h
View File

@ -48,7 +48,7 @@ struct ieee802154_local {
/* This one is used for scanning and other jobs not to be interfered
* with serial driver.
*/
struct workqueue_struct *dev_workqueue;
struct workqueue_struct *workqueue;
/* SoftMAC device is registered and running. One can add subinterfaces.
* This flag should be modified under slaves_mtx and RTNL, so you can

10
net/mac802154/main.c
View File

@ -343,9 +343,9 @@ int ieee802154_register_hw(struct ieee802154_hw *hw)
local->phy->set_frame_retries = mac802154_set_frame_retries;
}
local->dev_workqueue =
local->workqueue =
create_singlethread_workqueue(wpan_phy_name(local->phy));
if (!local->dev_workqueue) {
if (!local->workqueue) {
rc = -ENOMEM;
goto out;
}
@ -370,7 +370,7 @@ int ieee802154_register_hw(struct ieee802154_hw *hw)
return 0;
out_wq:
destroy_workqueue(local->dev_workqueue);
destroy_workqueue(local->workqueue);
out:
return rc;
}
@ -381,8 +381,8 @@ void ieee802154_unregister_hw(struct ieee802154_hw *hw)
struct ieee802154_local *local = hw_to_local(hw);
struct ieee802154_sub_if_data *sdata, *next;
flush_workqueue(local->dev_workqueue);
destroy_workqueue(local->dev_workqueue);
flush_workqueue(local->workqueue);
destroy_workqueue(local->workqueue);
rtnl_lock();

4
net/mac802154/mib.c
View File

@ -72,7 +72,7 @@ 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(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)
@ -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);
work->dev = dev;
queue_work(sdata->local->dev_workqueue, &work->work);
queue_work(sdata->local->workqueue, &work->work);
} else {
mutex_unlock(&sdata->local->phy->pib_lock);
}

2
net/mac802154/rx.c
View File

@ -105,6 +105,6 @@ ieee802154_rx_irqsafe(struct ieee802154_hw *hw, struct sk_buff *skb, u8 lqi)
work->hw = hw;
work->lqi = lqi;
queue_work(local->dev_workqueue, &work->work);
queue_work(local->workqueue, &work->work);
}
EXPORT_SYMBOL(ieee802154_rx_irqsafe);

2
net/mac802154/tx.c
View File

@ -119,7 +119,7 @@ netdev_tx_t mac802154_tx(struct ieee802154_local *local, struct sk_buff *skb,
work->page = page;
work->chan = chan;
queue_work(local->dev_workqueue, &work->work);
queue_work(local->workqueue, &work->work);
return NETDEV_TX_OK;