[PATCH] Convert management timer/work to a delayed work

This is likely not the final approch, as the code handles several
different timeouts and may need to be split.  Anyway, it would be easier
to split a single delayed work than a timer and a work.

When handling beacons, cancel the work first, as we want the timeout
handler to be deferred.  The delayed workqueue API doesn't seem to
provide a nicer way to do it.

Signed-off-by: Pavel Roskin <proski@gnu.org>

1 files changed, 1 insertions, 2 deletions

diff --git a/at76_usb.h b/at76_usb.h
index 691b837..111a5ee 100644
--- a/at76_usb.h
+++ b/at76_usb.h
@@ -468,12 +468,12 @@ struct at76_priv {
 	/* work queues */
 	struct work_struct work_assoc_done;
 	struct work_struct work_join;
-	struct work_struct work_mgmt_timeout;
 	struct work_struct work_new_bss;
 	struct work_struct work_scan;
 	struct work_struct work_set_promisc;
 	struct work_struct work_submit_rx;
 	struct delayed_work dwork_restart;
+	struct delayed_work dwork_mgmt;
 
 	int nr_submit_rx_tries;	/* number of tries to submit an rx urb left */
 	struct tasklet_struct rx_tasklet;
@@ -540,7 +540,6 @@ struct at76_priv {
 	} scan_state;
 	time_t last_scan;
 
-	struct timer_list mgmt_timer;	/* the timer we use to repeat auth_req etc. */
 	int retries;		/* counts backwards while re-trying to send auth/assoc_req's */
 	u8 pm_mode;		/* power management mode: AT76_PM_{OFF, ON, SMART} */
 	u32 pm_period;		/* power manag. period in us */