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

Commit 6e50c496 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz Committed by Greg Kroah-Hartman
Browse files

Staging: rt2870: use internal command for AsicUpdateProtect() 



Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 0df20b67

drivers/staging/rt2860/common/cmm_data.c

+2 −3
Original line number Diff line number Diff line
@@ -2459,10 +2459,9 @@ BOOLEAN MacTableDeleteEntry( 
	if (pAd->MacTab.Size == 0)

	{

		pAd->CommonCfg.AddHTInfo.AddHtInfo2.OperaionMode = 0;

#ifndef RT30xx

#ifdef RT2860

		AsicUpdateProtect(pAd, 0 /*pAd->CommonCfg.AddHTInfo.AddHtInfo2.OperaionMode*/, (ALLN_SETPROTECT), TRUE, 0 /*pAd->MacTab.fAnyStationNonGF*/);

#endif

#ifdef RT30xx

#else

		// edit by johnli, fix "in_interrupt" error when call "MacTableDeleteEntry" in Rx tasklet

		// Set MAC register value according operation mode

		RTUSBEnqueueInternalCmd(pAd, CMDTHREAD_UPDATE_PROTECT, NULL, 0);

drivers/staging/rt2870/common/rtusb_io.c

+0 −6
Original line number Diff line number Diff line
@@ -1810,17 +1810,11 @@ VOID CMDHandler( 
								pEntry->Addr[0], pEntry->Addr[1], pEntry->Addr[2], pEntry->Addr[3], pEntry->Addr[4], pEntry->Addr[5]);

					}

					break;



#ifdef RT30xx

// add by johnli, fix "in_interrupt" error when call "MacTableDeleteEntry" in Rx tasklet

				case CMDTHREAD_UPDATE_PROTECT:

					{

						AsicUpdateProtect(pAd, 0, (ALLN_SETPROTECT), TRUE, 0);

					}

					break;

// end johnli

#endif



				case OID_802_11_ADD_WEP:

					{

						UINT	i;