diff options
Diffstat (limited to 'drivers/net/wireless/libertas/assoc.h')
-rw-r--r-- | drivers/net/wireless/libertas/assoc.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/net/wireless/libertas/assoc.h b/drivers/net/wireless/libertas/assoc.h index 2ffd82d99b34..5e9c31f0932b 100644 --- a/drivers/net/wireless/libertas/assoc.h +++ b/drivers/net/wireless/libertas/assoc.h | |||
@@ -5,10 +5,12 @@ | |||
5 | 5 | ||
6 | #include "dev.h" | 6 | #include "dev.h" |
7 | 7 | ||
8 | void wlan_association_worker(struct work_struct *work); | 8 | void libertas_association_worker(struct work_struct *work); |
9 | 9 | ||
10 | struct assoc_request * wlan_get_association_request(wlan_adapter *adapter); | 10 | struct assoc_request * wlan_get_association_request(wlan_adapter *adapter); |
11 | 11 | ||
12 | void libertas_sync_channel(struct work_struct *work); | ||
13 | |||
12 | #define ASSOC_DELAY (HZ / 2) | 14 | #define ASSOC_DELAY (HZ / 2) |
13 | static inline void wlan_postpone_association_work(wlan_private *priv) | 15 | static inline void wlan_postpone_association_work(wlan_private *priv) |
14 | { | 16 | { |
@@ -21,9 +23,9 @@ static inline void wlan_postpone_association_work(wlan_private *priv) | |||
21 | static inline void wlan_cancel_association_work(wlan_private *priv) | 23 | static inline void wlan_cancel_association_work(wlan_private *priv) |
22 | { | 24 | { |
23 | cancel_delayed_work(&priv->assoc_work); | 25 | cancel_delayed_work(&priv->assoc_work); |
24 | if (priv->adapter->assoc_req) { | 26 | if (priv->adapter->pending_assoc_req) { |
25 | kfree(priv->adapter->assoc_req); | 27 | kfree(priv->adapter->pending_assoc_req); |
26 | priv->adapter->assoc_req = NULL; | 28 | priv->adapter->pending_assoc_req = NULL; |
27 | } | 29 | } |
28 | } | 30 | } |
29 | 31 | ||