commit f773054254b6aa0196063658c7e247e7c6eacbeb
author Alexander Aring <alex.aring@gmail.com> Sat Oct 25 17:16:41 2014 +0200
committer Marcel Holtmann <marcel@holtmann.org> Sat Oct 25 21:55:38 2014 +0200
tree 05be8383f48f9ed79971fd8004d5852950750642
parent 59d19cd70cd38afd2d9bf2e3b48c3a5bbb630b5a

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>

net/mac802154/ieee802154_i.h

diff --git a/net/mac802154/ieee802154_i.h b/net/mac802154/ieee802154_i.h
index 61885aa..7aae692 100644
--- a/net/mac802154/ieee802154_i.h
+++ b/net/mac802154/ieee802154_i.h
@@ -48,7 +48,7 @@
 	/* 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

net/mac802154/main.c

diff --git a/net/mac802154/main.c b/net/mac802154/main.c
index a34006e..5ce3184 100644
--- a/net/mac802154/main.c
+++ b/net/mac802154/main.c
@@ -343,9 +343,9 @@
 		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 @@
 	return 0;
 
 out_wq:
-	destroy_workqueue(local->dev_workqueue);
+	destroy_workqueue(local->workqueue);
 out:
 	return rc;
 }
@@ -381,8 +381,8 @@
 	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();
 

net/mac802154/mib.c

diff --git a/net/mac802154/mib.c b/net/mac802154/mib.c
index d7a2504..16baff1 100644
--- a/net/mac802154/mib.c
+++ b/net/mac802154/mib.c
@@ -72,7 +72,7 @@
 	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 @@
 
 		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);
 	}

net/mac802154/rx.c

diff --git a/net/mac802154/rx.c b/net/mac802154/rx.c
index 1b5e8e3..53c9e0c 100644
--- a/net/mac802154/rx.c
+++ b/net/mac802154/rx.c
@@ -105,6 +105,6 @@
 	work->hw = hw;
 	work->lqi = lqi;
 
-	queue_work(local->dev_workqueue, &work->work);
+	queue_work(local->workqueue, &work->work);
 }
 EXPORT_SYMBOL(ieee802154_rx_irqsafe);

net/mac802154/tx.c

diff --git a/net/mac802154/tx.c b/net/mac802154/tx.c
index 3684426..2c40d9b 100644
--- a/net/mac802154/tx.c
+++ b/net/mac802154/tx.c
@@ -119,7 +119,7 @@
 	work->page = page;
 	work->chan = chan;
 
-	queue_work(local->dev_workqueue, &work->work);
+	queue_work(local->workqueue, &work->work);
 
 	return NETDEV_TX_OK;