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: Alexander Aring <alex.aring@gmail.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

diff --git a/net/mac802154/ieee802154_i.h b/net/mac802154/ieee802154_i.h
index 61885aaea6b6567f878216f883d26510733b7b34..7aae6920fa3091431059fb8e8f389cfb37a2b4df 100644 (file)
--- a/net/mac802154/ieee802154_i.h
+++ b/net/mac802154/ieee802154_i.h
@@ -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

diff --git a/net/mac802154/main.c b/net/mac802154/main.c
index a34006edcb8dba45e6c2b99aef0a0a6adf107a72..5ce3184bc6748f1110fe79b4462175c4b636c826 100644 (file)
--- a/net/mac802154/main.c
+++ b/net/mac802154/main.c
@@ -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();
 

diff --git a/net/mac802154/mib.c b/net/mac802154/mib.c
index d7a25048a8af4be7e7f6c419df19e102044d03b0..16baff1ea3139d6a5bc89d9bdca50975e9770c6d 100644 (file)
--- a/net/mac802154/mib.c
+++ b/net/mac802154/mib.c
@@ -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);
        }

diff --git a/net/mac802154/rx.c b/net/mac802154/rx.c
index 1b5e8e332b9b72ab2acfdfe17048140c457f93d3..53c9e0c10a872a19df0ff6a8b43f13dfb79c81cc 100644 (file)
--- a/net/mac802154/rx.c
+++ b/net/mac802154/rx.c
@@ -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);

diff --git a/net/mac802154/tx.c b/net/mac802154/tx.c
index 36844264b20b76a96632cb5d3f1ee90f3d856e5d..2c40d9bb8387e5df03a536ac89fe3fc43b37a5e0 100644 (file)
--- a/net/mac802154/tx.c
+++ b/net/mac802154/tx.c
@@ -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;