Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (107 commits)
  smc911x: fix compilation breakage wjen debug is on
  [netdrvr] eexpress: minor corrections
  add NAPI support to sb1250-mac.c
  ixgb: ROUND_UP macro cleanup in drivers/net/ixgb
  e1000: ROUND_UP macro cleanup in drivers/net/e1000
  Generic HDLC sparse annotations
  e100: Optionally use I/O mode only to access register space
  e100: allow bad MAC address when running with invalid eeprom csum
  ehea: fix for dlpar support
  ehea: fix for sysfs entries
  3C509: Remove unnecessary include of <linux/pm_legacy.h>
  NetXen: Fix for vmalloc issues
  NetXen: Fixes for Power PC architecture
  NetXen: Port swap feature for multi port cards
  NetXen: Removal of redundant macros
  NetXen: Multi PCI support for Quad cards
  NetXen: Removal of redundant argument passing
  NetXen: Use multiple PCI functions
  [netdrvr e100] experiment with doing RX in a similar manner to eepro100
  [PATCH] ieee80211: add missing global needed by IEEE80211_DEBUG_XXXX
  ...

1 files changed, 52 insertions, 0 deletions

diff --git a/drivers/net/wireless/libertas/thread.h b/drivers/net/wireless/libertas/thread.h
new file mode 100644
index 000000000000..207b8a6cc33d
--- /dev/null
+++ b/drivers/net/wireless/libertas/thread.h
@@ -0,0 +1,52 @@
+#ifndef __WLAN_THREAD_H_
+#define __WLAN_THREAD_H_
+
+#include        <linux/kthread.h>
+
+struct wlan_thread {
+        struct task_struct *task;
+        wait_queue_head_t waitq;
+        pid_t pid;
+        void *priv;
+};
+
+static inline void wlan_activate_thread(struct wlan_thread * thr)
+{
+        /** Record the thread pid */
+        thr->pid = current->pid;
+
+        /** Initialize the wait queue */
+        init_waitqueue_head(&thr->waitq);
+}
+
+static inline void wlan_deactivate_thread(struct wlan_thread * thr)
+{
+        ENTER();
+
+        thr->pid = 0;
+
+        LEAVE();
+}
+
+static inline void wlan_create_thread(int (*wlanfunc) (void *),
+                                      struct wlan_thread * thr, char *name)
+{
+        thr->task = kthread_run(wlanfunc, thr, "%s", name);
+}
+
+static inline int wlan_terminate_thread(struct wlan_thread * thr)
+{
+        ENTER();
+
+        /* Check if the thread is active or not */
+        if (!thr->pid) {
+                printk(KERN_ERR "Thread does not exist\n");
+                return -1;
+        }
+        kthread_stop(thr->task);
+
+        LEAVE();
+        return 0;
+}
+
+#endif