Skip to contentSkip to conversation

RT2x00: Move scan_work to scanning structure

PATCH Superseded Ivo van Doorn 1 participant 2 messages Jul 26, 2006

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 11/24 RT2x00: Move scan_work to scanning structure

Quoted 1 line

From Ivo van Doorn <[email protected]>

Remove scan_work from rt2x00_dev and place it in the scanning structure.

---

diff -rU3 wireless-dev-sequence/drivers/net/wireless/d80211/rt2x00/rt2400pci.c wireless-dev-scan/drivers/net/wireless/d80211/rt2x00/rt2400pci.c --- wireless-dev-sequence/drivers/net/wireless/d80211/rt2x00/rt2400pci.c

2006-07-23 19:52:17.000000000 +0200
+++ wireless-dev-scan/drivers/net/wireless/d80211/rt2x00/rt2400pci.c	
2006-07-23 22:41:51.000000000 +0200

@@ -2139,7 +2139,8 @@
/*
* Queue work.
*/
- if (!queue_work(rt2x00dev->workqueue, &rt2x00dev->scan_work))
+ INIT_WORK(&rt2x00dev->scan->work, rt2400pci_scan, rt2x00dev);
+ if (!queue_work(rt2x00dev->workqueue, &rt2x00dev->scan->work))
goto exit;

return 0;
@@ -2599,7 +2600,6 @@
/*
* Intialize scanning attributes.
*/
- INIT_WORK(&rt2x00dev->scan_work, rt2400pci_scan, rt2x00dev);
rt2x00dev->scan = NULL;

if (rt2400pci_init_eeprom(rt2x00dev) ||
diff -rU3 wireless-dev-sequence/drivers/net/wireless/d80211/rt2x00/rt2500pci.c wireless-dev-scan/drivers/net/wireless/d80211/rt2x00/rt2500pci.c --- wireless-dev-sequence/drivers/net/wireless/d80211/rt2x00/rt2500pci.c

2006-07-23 19:52:28.000000000 +0200
+++ wireless-dev-scan/drivers/net/wireless/d80211/rt2x00/rt2500pci.c	
2006-07-23 22:41:58.000000000 +0200

@@ -2271,7 +2271,8 @@
/*
* Queue work.
*/
- if (!queue_work(rt2x00dev->workqueue, &rt2x00dev->scan_work))
+ INIT_WORK(&rt2x00dev->scan->work, rt2500pci_scan, rt2x00dev);
+ if (!queue_work(rt2x00dev->workqueue, &rt2x00dev->scan->work))
goto exit;

return 0;
@@ -2865,7 +2866,6 @@
/*
* Intialize scanning attributes.
*/
- INIT_WORK(&rt2x00dev->scan_work, rt2500pci_scan, rt2x00dev);
rt2x00dev->scan = NULL;

if (rt2500pci_init_eeprom(rt2x00dev) ||
diff -rU3 wireless-dev-sequence/drivers/net/wireless/d80211/rt2x00/rt2500usb.c wireless-dev-scan/drivers/net/wireless/d80211/rt2x00/rt2500usb.c --- wireless-dev-sequence/drivers/net/wireless/d80211/rt2x00/rt2500usb.c

2006-07-23 19:54:54.000000000 +0200
+++ wireless-dev-scan/drivers/net/wireless/d80211/rt2x00/rt2500usb.c	
2006-07-23 22:42:03.000000000 +0200

@@ -1942,7 +1942,8 @@
/*
* Queue work.
*/
- if (!queue_work(rt2x00dev->workqueue, &rt2x00dev->scan_work))
+ INIT_WORK(&rt2x00dev->scan->work, rt2500usb_scan, rt2x00dev);
+ if (!queue_work(rt2x00dev->workqueue, &rt2x00dev->scan->work))
goto exit;

return 0;
@@ -2481,7 +2482,6 @@
/*
* Intialize scanning attributes.
*/
- INIT_WORK(&rt2x00dev->scan_work, rt2500usb_scan, rt2x00dev);
rt2x00dev->scan = NULL;

if (rt2500usb_init_eeprom(rt2x00dev) ||
diff -rU3 wireless-dev-sequence/drivers/net/wireless/d80211/rt2x00/rt2x00.h wireless-dev-scan/drivers/net/wireless/d80211/rt2x00/rt2x00.h --- wireless-dev-sequence/drivers/net/wireless/d80211/rt2x00/rt2x00.h

2006-07-23 19:49:00.000000000 +0200

+++ wireless-dev-scan/drivers/net/wireless/d80211/rt2x00/rt2x00.h 2006-07-23
22:32:51.000000000 +0200
@@ -676,6 +676,11 @@
short status;
#define SCANNING_READY 0x0001
#define SCANNING_CANCELLED 0x0002
+
+ /*
+ * Work structure for scheduling the scanning work.
+ */
+ struct work_struct work;
};

/*
diff -rU3 wireless-dev-sequence/drivers/net/wireless/d80211/rt2x00/rt61pci.c wireless-dev-scan/drivers/net/wireless/d80211/rt2x00/rt61pci.c --- wireless-dev-sequence/drivers/net/wireless/d80211/rt2x00/rt61pci.c

2006-07-23 19:53:45.000000000 +0200

+++ wireless-dev-scan/drivers/net/wireless/d80211/rt2x00/rt61pci.c 2006-07-23
22:42:09.000000000 +0200
@@ -2764,7 +2764,8 @@
/*
* Queue work.
*/
- if (!queue_work(rt2x00dev->workqueue, &rt2x00dev->scan_work))
+ INIT_WORK(&rt2x00dev->scan->work, rt61pci_scan, rt2x00dev);
+ if (!queue_work(rt2x00dev->workqueue, &rt2x00dev->scan->work))
goto exit;

return 0;
@@ -3438,7 +3439,6 @@
/*
* Initialize scanning attributes.
*/
- INIT_WORK(&rt2x00dev->scan_work, rt61pci_scan, rt2x00dev);
rt2x00dev->scan = NULL;

if (rt61pci_init_eeprom(rt2x00dev) ||
diff -rU3 wireless-dev-sequence/drivers/net/wireless/d80211/rt2x00/rt73usb.c wireless-dev-scan/drivers/net/wireless/d80211/rt2x00/rt73usb.c --- wireless-dev-sequence/drivers/net/wireless/d80211/rt2x00/rt73usb.c

2006-07-23 19:54:16.000000000 +0200

+++ wireless-dev-scan/drivers/net/wireless/d80211/rt2x00/rt73usb.c 2006-07-23
22:35:17.000000000 +0200
@@ -2266,7 +2266,8 @@
/*
* Queue work.
*/
- if (!queue_work(rt2x00dev->workqueue, &rt2x00dev->scan_work))
+ INIT_WORK(&rt2x00dev->scan->work, rt73usb_scan, rt2x00dev);
+ if (!queue_work(rt2x00dev->workqueue, &rt2x00dev->scan->work))
goto exit;

return 0;
@@ -2910,7 +2911,6 @@
/*
* Intialize scanning attributes.
*/
- INIT_WORK(&rt2x00dev->scan_work, rt73usb_scan, rt2x00dev);
rt2x00dev->scan = NULL;

if (rt73usb_init_eeprom(rt2x00dev) ||

#1 lore raw
Quoted 1 line

From Ivo van Doorn <[email protected]>

Remove scan_work from rt2x00_dev and place it in the scanning structure.

drivers/net/wireless/d80211/rt2x00/rt2400pci.c +2 -2
diff -rU3 wireless-dev-sequence/drivers/net/wireless/d80211/rt2x00/rt2400pci.c wireless-dev-scan/drivers/net/wireless/d80211/rt2x00/rt2400pci.c
@@ -2139,7 +2139,8 @@
 	/*
 	 * Queue work.
 	 */
-	if (!queue_work(rt2x00dev->workqueue, &rt2x00dev->scan_work))
+	INIT_WORK(&rt2x00dev->scan->work, rt2400pci_scan, rt2x00dev);
+	if (!queue_work(rt2x00dev->workqueue, &rt2x00dev->scan->work))
 		goto exit;
 
 	return 0;
@@ -2599,7 +2600,6 @@
 	/*
 	 * Intialize scanning attributes.
 	 */
-	INIT_WORK(&rt2x00dev->scan_work, rt2400pci_scan, rt2x00dev);
 	rt2x00dev->scan = NULL;
 
 	if (rt2400pci_init_eeprom(rt2x00dev) ||
drivers/net/wireless/d80211/rt2x00/rt2500pci.c +2 -2
diff -rU3 wireless-dev-sequence/drivers/net/wireless/d80211/rt2x00/rt2500pci.c wireless-dev-scan/drivers/net/wireless/d80211/rt2x00/rt2500pci.c
@@ -2271,7 +2271,8 @@
 	/*
 	 * Queue work.
 	 */
-	if (!queue_work(rt2x00dev->workqueue, &rt2x00dev->scan_work))
+	INIT_WORK(&rt2x00dev->scan->work, rt2500pci_scan, rt2x00dev);
+	if (!queue_work(rt2x00dev->workqueue, &rt2x00dev->scan->work))
 		goto exit;
 
 	return 0;
@@ -2865,7 +2866,6 @@
 	/*
 	 * Intialize scanning attributes.
 	 */
-	INIT_WORK(&rt2x00dev->scan_work, rt2500pci_scan, rt2x00dev);
 	rt2x00dev->scan = NULL;
 
 	if (rt2500pci_init_eeprom(rt2x00dev) ||
drivers/net/wireless/d80211/rt2x00/rt2500usb.c +2 -2
diff -rU3 wireless-dev-sequence/drivers/net/wireless/d80211/rt2x00/rt2500usb.c wireless-dev-scan/drivers/net/wireless/d80211/rt2x00/rt2500usb.c
@@ -1942,7 +1942,8 @@
 	/*
 	 * Queue work.
 	 */
-	if (!queue_work(rt2x00dev->workqueue, &rt2x00dev->scan_work))
+	INIT_WORK(&rt2x00dev->scan->work, rt2500usb_scan, rt2x00dev);
+	if (!queue_work(rt2x00dev->workqueue, &rt2x00dev->scan->work))
 		goto exit;
 
 	return 0;
@@ -2481,7 +2482,6 @@
 	/*
 	 * Intialize scanning attributes.
 	 */
-	INIT_WORK(&rt2x00dev->scan_work, rt2500usb_scan, rt2x00dev);
 	rt2x00dev->scan = NULL;
 
 	if (rt2500usb_init_eeprom(rt2x00dev) ||
drivers/net/wireless/d80211/rt2x00/rt2x00.h +5 -0
diff -rU3 wireless-dev-sequence/drivers/net/wireless/d80211/rt2x00/rt2x00.h wireless-dev-scan/drivers/net/wireless/d80211/rt2x00/rt2x00.h
@@ -676,6 +676,11 @@
 	short status;
 #define SCANNING_READY		0x0001
 #define SCANNING_CANCELLED	0x0002
+
+	/*
+	 * Work structure for scheduling the scanning work.
+	 */
+	struct work_struct work;
 };
 
 /*
drivers/net/wireless/d80211/rt2x00/rt61pci.c +2 -2
diff -rU3 wireless-dev-sequence/drivers/net/wireless/d80211/rt2x00/rt61pci.c wireless-dev-scan/drivers/net/wireless/d80211/rt2x00/rt61pci.c
@@ -2764,7 +2764,8 @@
 	/*
 	 * Queue work.
 	 */
-	if (!queue_work(rt2x00dev->workqueue, &rt2x00dev->scan_work))
+	INIT_WORK(&rt2x00dev->scan->work, rt61pci_scan, rt2x00dev);
+	if (!queue_work(rt2x00dev->workqueue, &rt2x00dev->scan->work))
 		goto exit;
 
 	return 0;
@@ -3438,7 +3439,6 @@
 	/*
 	 * Initialize scanning attributes.
 	 */
-	INIT_WORK(&rt2x00dev->scan_work, rt61pci_scan, rt2x00dev);
 	rt2x00dev->scan = NULL;
 
 	if (rt61pci_init_eeprom(rt2x00dev) ||
drivers/net/wireless/d80211/rt2x00/rt73usb.c +2 -2
diff -rU3 wireless-dev-sequence/drivers/net/wireless/d80211/rt2x00/rt73usb.c wireless-dev-scan/drivers/net/wireless/d80211/rt2x00/rt73usb.c
@@ -2266,7 +2266,8 @@
 	/*
 	 * Queue work.
 	 */
-	if (!queue_work(rt2x00dev->workqueue, &rt2x00dev->scan_work))
+	INIT_WORK(&rt2x00dev->scan->work, rt73usb_scan, rt2x00dev);
+	if (!queue_work(rt2x00dev->workqueue, &rt2x00dev->scan->work))
 		goto exit;
 
 	return 0;
@@ -2910,7 +2911,6 @@
 	/*
 	 * Intialize scanning attributes.
 	 */
-	INIT_WORK(&rt2x00dev->scan_work, rt73usb_scan, rt2x00dev);
 	rt2x00dev->scan = NULL;
 
 	if (rt73usb_init_eeprom(rt2x00dev) ||