diff options
| author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-08-23 15:29:58 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-09-15 12:02:21 -0700 |
| commit | 6e50c49684ff3240b04b91d8d8e64ad7a902ca78 (patch) | |
| tree | 33350e462a934330d91e78ceb49c589b92ba0ca6 /drivers | |
| parent | 0df20b67eb6db0e4a8c011e8d5a45c47a228083a (diff) | |
Staging: rt2870: use internal command for AsicUpdateProtect()
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/rt2860/common/cmm_data.c | 5 | ||||
| -rw-r--r-- | drivers/staging/rt2870/common/rtusb_io.c | 6 |
2 files changed, 2 insertions, 9 deletions
diff --git a/drivers/staging/rt2860/common/cmm_data.c b/drivers/staging/rt2860/common/cmm_data.c index 3700cb816ad8..9b8337d76292 100644 --- a/drivers/staging/rt2860/common/cmm_data.c +++ b/drivers/staging/rt2860/common/cmm_data.c @@ -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); diff --git a/drivers/staging/rt2870/common/rtusb_io.c b/drivers/staging/rt2870/common/rtusb_io.c index 30c032d614ec..7acfdf883138 100644 --- a/drivers/staging/rt2870/common/rtusb_io.c +++ b/drivers/staging/rt2870/common/rtusb_io.c @@ -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; |