diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-09-04 17:32:04 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-09-04 17:32:04 +1000 |
commit | 1a4072a95e8f79c2e52aed795e0e54428b0f31fc (patch) | |
tree | 6e7aa0663141156aa8fd57c8120a0aa76daf8d66 /drivers/staging/rt2860/common/action.c | |
parent | 111a3b94375ee87535ac985de4c94be5e5634881 (diff) | |
parent | c0e03fabb4f2a6e48f6e0b55729b26a599a2bd02 (diff) |
Merge branch 'quilt/staging'
Conflicts:
drivers/staging/at76_usb/at76_usb.c
drivers/staging/epl/VirtualEthernetLinux.c
Diffstat (limited to 'drivers/staging/rt2860/common/action.c')
-rw-r--r-- | drivers/staging/rt2860/common/action.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/drivers/staging/rt2860/common/action.c b/drivers/staging/rt2860/common/action.c index a4d9fdc0736e..256cb67e0594 100644 --- a/drivers/staging/rt2860/common/action.c +++ b/drivers/staging/rt2860/common/action.c @@ -528,15 +528,8 @@ VOID SendRefreshBAR( sizeof(FRAME_BAR), &FrameBar, END_OF_ARGS); - if (1) // Now we always send BAR. - { -#ifndef RT30xx - MiniportMMRequest(pAd, 0, pOutBuffer, FrameLen); -#endif -#ifdef RT30xx - MiniportMMRequest(pAd, QID_AC_BE, pOutBuffer, FrameLen); -#endif - } + MiniportMMRequest(pAd, QID_AC_BE, pOutBuffer, FrameLen); + MlmeFreeMemory(pAd, pOutBuffer); } } |