Staging: rt2870: use internal command for AsicUpdateProtect()

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/rt2860/common/cmm_data.c b/drivers/staging/rt2860/common/cmm_data.c
index 3700cb816ad809c0c9afdb8f97c13ac7464fa2e7..9b8337d762920bb7c5187f6de0c53d3fd3b5cb72 100644 (file)
--- 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 30c032d614ec4472084ac568ac971ff934b734ee..7acfdf88313813287980b5b5c13458073a28a71c 100644 (file)
--- 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;