[PATCH] libertas: rename wlan_association_worker

Renames wlan_association_worker into libertas_association_worker

Signed-off-by: Holger Schurig <hs4233@mail.mn-solutions.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/libertas/assoc.c b/drivers/net/wireless/libertas/assoc.c
index c260bd1b3d46667df8cd32f2beb3fd2a06a59eb0..8e6b6b7eca296466209b9d15778fb1c98b471cf5 100644 (file)
--- a/drivers/net/wireless/libertas/assoc.c
+++ b/drivers/net/wireless/libertas/assoc.c
@@ -345,7 +345,7 @@ static int should_stop_adhoc(wlan_adapter *adapter,
 }
 
 
-void wlan_association_worker(struct work_struct *work)
+void libertas_association_worker(struct work_struct *work)
 {
        wlan_private *priv = container_of(work, wlan_private, assoc_work.work);
        wlan_adapter *adapter = priv->adapter;

diff --git a/drivers/net/wireless/libertas/assoc.h b/drivers/net/wireless/libertas/assoc.h
index 2ffd82d99b340a7e9ae2aba95dea150d2a019782..f9b2ad47ee6e4cfcfb8f7473785c679c999ad6e9 100644 (file)
--- a/drivers/net/wireless/libertas/assoc.h
+++ b/drivers/net/wireless/libertas/assoc.h
@@ -5,7 +5,7 @@
 
 #include "dev.h"
 
-void wlan_association_worker(struct work_struct *work);
+void libertas_association_worker(struct work_struct *work);
 
 struct assoc_request * wlan_get_association_request(wlan_adapter *adapter);
 

diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c
index b9b25ce6591934e1ebbb0808765dc778bf1682c9..2287e4bfda5376da2a9953753a33cb84fcff954b 100644 (file)
--- a/drivers/net/wireless/libertas/main.c
+++ b/drivers/net/wireless/libertas/main.c
@@ -964,7 +964,7 @@ wlan_private *wlan_add_card(void *card)
 
        priv->assoc_thread =
                create_singlethread_workqueue("libertas_assoc");
-       INIT_DELAYED_WORK(&priv->assoc_work, wlan_association_worker);
+       INIT_DELAYED_WORK(&priv->assoc_work, libertas_association_worker);
 
        /*
         * Register the device. Fillup the private data structure with