aboutsummaryrefslogtreecommitdiff
path: root/drivers/staging
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2009-08-23 15:30:37 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2009-09-15 12:02:22 -0700
commit9a93e4e1aa8c4f65f455456bc2bb1bcb306ac0f1 (patch)
treef3ce417942f2544628248306b8ced5686334834e /drivers/staging
parentff81b066fb9fd2a6eaa77a8bedfad2e5dcddd9a2 (diff)
Staging: rt28x0 fix BACapability policy handling
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/rt2860/common/cmm_info.c7
-rw-r--r--drivers/staging/rt2860/rt_profile.c6
2 files changed, 1 insertions, 12 deletions
diff --git a/drivers/staging/rt2860/common/cmm_info.c b/drivers/staging/rt2860/common/cmm_info.c
index 9f3263369ed..05623979e6b 100644
--- 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 0809f2170a9..3df85cff4ec 100644
--- 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"));
}