---

yaml --- r: 57616 b: refs/heads/master c: eb3ce63 h: refs/heads/master v: v3
git-mirror · Jun 11, 2007 · 915a285 · 915a285
1 parent 6932b1c
commit 915a285
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 064827edf6901e5fcbd84fc258fb2326a530da9c
+refs/heads/master: eb3ce631f9abc45a98a12699d5a25742fd8421e7
diff --git a/trunk/drivers/net/wireless/libertas/assoc.c b/trunk/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/trunk/drivers/net/wireless/libertas/assoc.h b/trunk/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/trunk/drivers/net/wireless/libertas/main.c b/trunk/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