Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 710ad849 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6:
  Staging: rspiusb: Fix buffer overflow
  staging: add dependencies on PCI for drivers that require it
  Staging: rtl8192su: fix build error
  Staging: rt2870: Revert d44ca7 Removal of kernel_thread() API
  Staging: rt2870: Add USB ID for Linksys, Planex Communications, Belkin
parents b32b8e64 749d00db

drivers/staging/b3dfg/Kconfig

+1 −0
Original line number Diff line number Diff line 
config B3DFG

       tristate "Brontes 3d Frame Framegrabber"

       depends on PCI

       default n

       ---help---

         This driver provides support for the Brontes 3d Framegrabber

drivers/staging/heci/Kconfig

+1 −0
Original line number Diff line number Diff line 
config HECI

	tristate "Intel Management Engine Interface (MEI) Support"

	depends on PCI

	---help---

	  The Intel Management Engine Interface (Intel MEI) driver allows

	  applications to access the Active Management Technology

drivers/staging/rspiusb/rspiusb.c

+2 −0
Original line number Diff line number Diff line
@@ -716,6 +716,8 @@ static int MapUserBuffer(struct ioctl_struct *io, struct device_extension *pdx) 
		pdx->PixelUrb[frameInfo][i]->transfer_flags =

		    URB_NO_TRANSFER_DMA_MAP | URB_NO_INTERRUPT;

	}

	if (i == 0)

		return -EINVAL;

	/* only interrupt when last URB completes */

	pdx->PixelUrb[frameInfo][--i]->transfer_flags &= ~URB_NO_INTERRUPT;

	pdx->pendedPixelUrbs[frameInfo] =

drivers/staging/rt2860/rt_linux.h

+4 −9
Original line number Diff line number Diff line
@@ -43,9 +43,6 @@ 
#include "rtmp_type.h"

#include <linux/module.h>

#include <linux/kernel.h>

#if !defined(RT2860) && !defined(RT30xx)

#include <linux/kthread.h>

#endif



#include <linux/spinlock.h>

#include <linux/init.h>
@@ -166,9 +163,7 @@ typedef int (*HARD_START_XMIT_FUNC)(struct sk_buff *skb, struct net_device *net_ 


#ifndef RT30xx

typedef	struct pid *	THREAD_PID;

#ifdef RT2860

#define	THREAD_PID_INIT_VALUE	NULL

#endif

#define	GET_PID(_v)	find_get_pid(_v)

#define	GET_PID_NUMBER(_v)	pid_nr(_v)

#define CHECK_PID_LEGALITY(_pid)	if (pid_nr(_pid) >= 0)
@@ -191,9 +186,9 @@ struct os_cookie { 
	struct usb_device		*pUsb_Dev;



#ifndef RT30xx

	struct task_struct	*MLMEThr_task;

	struct task_struct	*RTUSBCmdThr_task;

	struct task_struct	*TimerQThr_task;

	THREAD_PID				MLMEThr_pid;

	THREAD_PID				RTUSBCmdThr_pid;

	THREAD_PID				TimerQThr_pid;

#endif

#ifdef RT30xx

	struct pid	*MLMEThr_pid;

drivers/staging/rt2870/2870_main_dev.c

+45 −22
Original line number Diff line number Diff line
@@ -235,7 +235,7 @@ INT MlmeThread( 
	DBGPRINT(RT_DEBUG_TRACE,( "<---%s\n",__func__));



#ifndef RT30xx

	pObj->MLMEThr_task = NULL;

	pObj->MLMEThr_pid = THREAD_PID_INIT_VALUE;

#endif

#ifdef RT30xx

	pObj->MLMEThr_pid = NULL;
@@ -348,7 +348,7 @@ INT RTUSBCmdThread( 
	DBGPRINT(RT_DEBUG_TRACE,( "<---RTUSBCmdThread\n"));



#ifndef RT30xx

	pObj->RTUSBCmdThr_task = NULL;

	pObj->RTUSBCmdThr_pid = THREAD_PID_INIT_VALUE;

#endif

#ifdef RT30xx

	pObj->RTUSBCmdThr_pid = NULL;
@@ -447,7 +447,7 @@ INT TimerQThread( 
	DBGPRINT(RT_DEBUG_TRACE,( "<---%s\n",__func__));



#ifndef RT30xx

	pObj->TimerQThr_task = NULL;

	pObj->TimerQThr_pid = THREAD_PID_INIT_VALUE;

#endif

#ifdef RT30xx

	pObj->TimerQThr_pid = NULL;
@@ -883,46 +883,69 @@ VOID RT28xxThreadTerminate( 


	// Terminate Threads

#ifndef RT30xx

	BUG_ON(pObj->TimerQThr_task == NULL);

	CHECK_PID_LEGALITY(task_pid(pObj->TimerQThr_task))

	CHECK_PID_LEGALITY(pObj->TimerQThr_pid)

	{

		POS_COOKIE pObj = (POS_COOKIE)pAd->OS_Cookie;



		printk(KERN_DEBUG "Terminate the TimerQThr pid=%d!\n",

			pid_nr(task_pid(pObj->TimerQThr_task)));

		printk("Terminate the TimerQThr_pid=%d!\n", GET_PID_NUMBER(pObj->TimerQThr_pid));

		mb();

		pAd->TimerFunc_kill = 1;

		mb();

		kthread_stop(pObj->TimerQThr_task);

		pObj->TimerQThr_task = NULL;

		ret = KILL_THREAD_PID(pObj->TimerQThr_pid, SIGTERM, 1);

		if (ret)

		{

			printk(KERN_WARNING "%s: unable to stop TimerQThread, pid=%d, ret=%d!\n",

					pAd->net_dev->name, GET_PID_NUMBER(pObj->TimerQThr_pid), ret);

		}

		else

		{

			wait_for_completion(&pAd->TimerQComplete);

			pObj->TimerQThr_pid = THREAD_PID_INIT_VALUE;

		}

	}



	BUG_ON(pObj->MLMEThr_task == NULL);

	CHECK_PID_LEGALITY(task_pid(pObj->MLMEThr_task))

	CHECK_PID_LEGALITY(pObj->MLMEThr_pid)

	{

		printk(KERN_DEBUG "Terminate the MLMEThr pid=%d!\n",

			pid_nr(task_pid(pObj->MLMEThr_task)));

		printk("Terminate the MLMEThr_pid=%d!\n", GET_PID_NUMBER(pObj->MLMEThr_pid));

		mb();

		pAd->mlme_kill = 1;

		//RT28XX_MLME_HANDLER(pAd);

		mb();

		kthread_stop(pObj->MLMEThr_task);

		pObj->MLMEThr_task = NULL;

		ret = KILL_THREAD_PID(pObj->MLMEThr_pid, SIGTERM, 1);

		if (ret)

		{

			printk (KERN_WARNING "%s: unable to Mlme thread, pid=%d, ret=%d!\n",

					pAd->net_dev->name, GET_PID_NUMBER(pObj->MLMEThr_pid), ret);

		}

		else

		{

			//wait_for_completion (&pAd->notify);

			wait_for_completion (&pAd->mlmeComplete);

			pObj->MLMEThr_pid = THREAD_PID_INIT_VALUE;

		}

	}



	BUG_ON(pObj->RTUSBCmdThr_task == NULL);

	CHECK_PID_LEGALITY(task_pid(pObj->RTUSBCmdThr_task))

	CHECK_PID_LEGALITY(pObj->RTUSBCmdThr_pid)

	{

		printk(KERN_DEBUG "Terminate the RTUSBCmdThr pid=%d!\n",

			pid_nr(task_pid(pObj->RTUSBCmdThr_task)));

		printk("Terminate the RTUSBCmdThr_pid=%d!\n", GET_PID_NUMBER(pObj->RTUSBCmdThr_pid));

		mb();

		NdisAcquireSpinLock(&pAd->CmdQLock);

		pAd->CmdQ.CmdQState = RT2870_THREAD_STOPED;

		NdisReleaseSpinLock(&pAd->CmdQLock);

		mb();

		//RTUSBCMDUp(pAd);

		kthread_stop(pObj->RTUSBCmdThr_task);

		pObj->RTUSBCmdThr_task = NULL;

		ret = KILL_THREAD_PID(pObj->RTUSBCmdThr_pid, SIGTERM, 1);

		if (ret)

		{

			printk(KERN_WARNING "%s: unable to RTUSBCmd thread, pid=%d, ret=%d!\n",

					pAd->net_dev->name, GET_PID_NUMBER(pObj->RTUSBCmdThr_pid), ret);

		}

		else

		{

			//wait_for_completion (&pAd->notify);

			wait_for_completion (&pAd->CmdQComplete);

			pObj->RTUSBCmdThr_pid = THREAD_PID_INIT_VALUE;

		}

	}

#endif

#ifdef RT30xx
@@ -1045,7 +1068,7 @@ BOOLEAN RT28XXChipsetCheck( 
			dev_p->descriptor.idProduct == rtusb_usb_id[i].idProduct)

		{

#ifndef RT30xx

			printk(KERN_DEBUG "rt2870: idVendor = 0x%x, idProduct = 0x%x\n",

			printk("rt2870: idVendor = 0x%x, idProduct = 0x%x\n",

#endif

#ifdef RT30xx

			printk("rt2870: idVendor = 0x%x, idProduct = 0x%x\n",