Staging: rt28x0 fix BACapability policy handling

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_info.c b/drivers/staging/rt2860/common/cmm_info.c
index 9f3263369edd4885e095eebe3751304bd26fb8a5..05623979e6b87282f9cad774839a6a0425ee12fc 100644 (file)
--- a/drivers/staging/rt2860/common/cmm_info.c
+++ b/drivers/staging/rt2860/common/cmm_info.c
@@ -2491,24 +2491,19 @@ INT     Set_HtAutoBa_Proc(
        if (Value == 0)
        {
                pAd->CommonCfg.BACapability.field.AutoBA = FALSE;
-#ifdef RT30xx
                pAd->CommonCfg.BACapability.field.Policy = BA_NOTUSE;
-#endif
        }
     else if (Value == 1)
        {
                pAd->CommonCfg.BACapability.field.AutoBA = TRUE;
-#ifdef RT30xx
                pAd->CommonCfg.BACapability.field.Policy = IMMED_BA;
-#endif
        }
        else
                return FALSE; //Invalid argument
 
     pAd->CommonCfg.REGBACapability.field.AutoBA = pAd->CommonCfg.BACapability.field.AutoBA;
-#ifdef RT30xx
     pAd->CommonCfg.REGBACapability.field.Policy = pAd->CommonCfg.BACapability.field.Policy;
-#endif
+
        SetCommonHT(pAd);
 
        DBGPRINT(RT_DEBUG_TRACE, ("Set_HtAutoBa_Proc::(HtAutoBa=%d)\n",pAd->CommonCfg.BACapability.field.AutoBA));

diff --git a/drivers/staging/rt2860/rt_profile.c b/drivers/staging/rt2860/rt_profile.c
index 0809f2170a92052c3a2d208da2ac68ad76522698..3df85cff4ec48f588eaf2490645ee7a5b7ee3c56 100644 (file)
--- a/drivers/staging/rt2860/rt_profile.c
+++ b/drivers/staging/rt2860/rt_profile.c
@@ -1558,21 +1558,15 @@ static void     HTParametersHook(
         if (Value == 0)
         {
             pAd->CommonCfg.BACapability.field.AutoBA = FALSE;
-#ifdef RT30xx
            pAd->CommonCfg.BACapability.field.Policy = BA_NOTUSE;
-#endif
         }
         else
         {
             pAd->CommonCfg.BACapability.field.AutoBA = TRUE;
-#ifdef RT30xx
            pAd->CommonCfg.BACapability.field.Policy = IMMED_BA;
-#endif
         }
         pAd->CommonCfg.REGBACapability.field.AutoBA = pAd->CommonCfg.BACapability.field.AutoBA;
-#ifdef RT30xx
        pAd->CommonCfg.REGBACapability.field.Policy = pAd->CommonCfg.BACapability.field.Policy;
-#endif
         DBGPRINT(RT_DEBUG_TRACE, ("HT: Auto BA  = %s\n", (Value==0) ? "Disable" : "Enable"));
     }