Commit 0c8c0f74 authored by Michael Straube's avatar Michael Straube Committed by Greg Kroah-Hartman

staging: rtl8188eu: remove 5 GHz code from Hal_GetChnlGroup88E()

Remove code valid only for 5 GHz from Hal_GetChnlGroup88E().
This addresses the below TODO item.

- find and remove remaining code valid only for 5 GHz. Most of the obvious
  ones have been removed, but things like channel > 14 still exist.
Signed-off-by: default avatarMichael Straube <straube.linux@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent beed1ce2
...@@ -382,53 +382,19 @@ static u8 Hal_GetChnlGroup88E(u8 chnl, u8 *pGroup) ...@@ -382,53 +382,19 @@ static u8 Hal_GetChnlGroup88E(u8 chnl, u8 *pGroup)
{ {
u8 bIn24G = true; u8 bIn24G = true;
if (chnl <= 14) { if (chnl < 3) /* Channel 1-2 */
bIn24G = true; *pGroup = 0;
else if (chnl < 6) /* Channel 3-5 */
if (chnl < 3) /* Channel 1-2 */ *pGroup = 1;
*pGroup = 0; else if (chnl < 9) /* Channel 6-8 */
else if (chnl < 6) /* Channel 3-5 */ *pGroup = 2;
*pGroup = 1; else if (chnl < 12) /* Channel 9-11 */
else if (chnl < 9) /* Channel 6-8 */ *pGroup = 3;
*pGroup = 2; else if (chnl < 14) /* Channel 12-13 */
else if (chnl < 12) /* Channel 9-11 */ *pGroup = 4;
*pGroup = 3; else if (chnl == 14) /* Channel 14 */
else if (chnl < 14) /* Channel 12-13 */ *pGroup = 5;
*pGroup = 4;
else if (chnl == 14) /* Channel 14 */
*pGroup = 5;
} else {
/* probably, this branch is suitable only for 5 GHz */
bIn24G = false;
if (chnl <= 40)
*pGroup = 0;
else if (chnl <= 48)
*pGroup = 1;
else if (chnl <= 56)
*pGroup = 2;
else if (chnl <= 64)
*pGroup = 3;
else if (chnl <= 104)
*pGroup = 4;
else if (chnl <= 112)
*pGroup = 5;
else if (chnl <= 120)
*pGroup = 5;
else if (chnl <= 128)
*pGroup = 6;
else if (chnl <= 136)
*pGroup = 7;
else if (chnl <= 144)
*pGroup = 8;
else if (chnl <= 153)
*pGroup = 9;
else if (chnl <= 161)
*pGroup = 10;
else if (chnl <= 177)
*pGroup = 11;
}
return bIn24G; return bIn24G;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment