diff options
author | Holger Schurig <hs4233@mail.mn-solutions.de> | 2007-10-26 04:12:14 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-28 18:03:34 -0500 |
commit | 9f9dac281ba2acd3d6d3574076f86b8f99aaebc0 (patch) | |
tree | d895e893f307d210fdecbc74c5b4b746e4507623 /drivers/net/wireless/libertas/assoc.h | |
parent | 49df2b33478fd67e642d05786d06de322504842c (diff) |
libertas: move wlan_*_association_work from header to c file
Move wlan_postpone_association_work() and wlan_cancel_association_work()
from a assoc.h file to the sole user, into wext.c.
Renamed those two functions to to libertas_XXX as well.
Signed-off-by: Holger Schurig <hs4233@mail.mn-solutions.de>
Acked-by: Dan Williams <dcbw@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/libertas/assoc.h')
-rw-r--r-- | drivers/net/wireless/libertas/assoc.h | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/drivers/net/wireless/libertas/assoc.h b/drivers/net/wireless/libertas/assoc.h index e09b7490abbd..ed737eb995c0 100644 --- a/drivers/net/wireless/libertas/assoc.h +++ b/drivers/net/wireless/libertas/assoc.h | |||
@@ -11,22 +11,4 @@ struct assoc_request * wlan_get_association_request(wlan_adapter *adapter); | |||
11 | 11 | ||
12 | void libertas_sync_channel(struct work_struct *work); | 12 | void libertas_sync_channel(struct work_struct *work); |
13 | 13 | ||
14 | #define ASSOC_DELAY (HZ / 2) | ||
15 | static inline void wlan_postpone_association_work(wlan_private *priv) | ||
16 | { | ||
17 | if (priv->adapter->surpriseremoved) | ||
18 | return; | ||
19 | cancel_delayed_work(&priv->assoc_work); | ||
20 | queue_delayed_work(priv->work_thread, &priv->assoc_work, ASSOC_DELAY); | ||
21 | } | ||
22 | |||
23 | static inline void wlan_cancel_association_work(wlan_private *priv) | ||
24 | { | ||
25 | cancel_delayed_work(&priv->assoc_work); | ||
26 | if (priv->adapter->pending_assoc_req) { | ||
27 | kfree(priv->adapter->pending_assoc_req); | ||
28 | priv->adapter->pending_assoc_req = NULL; | ||
29 | } | ||
30 | } | ||
31 | |||
32 | #endif /* _WLAN_ASSOC_H */ | 14 | #endif /* _WLAN_ASSOC_H */ |