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

staging: r8188eu: remove enum odm_bw

The enums odm_bw and ht_channel_width are redundant. Keep
ht_channel_width and remove odm_bw.
Signed-off-by: default avatarMichael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20220220100212.7466-4-straube.linux@gmail.comSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 165f2997
...@@ -266,7 +266,7 @@ static void odm_CommonInfoSelfUpdate(struct odm_dm_struct *pDM_Odm) ...@@ -266,7 +266,7 @@ static void odm_CommonInfoSelfUpdate(struct odm_dm_struct *pDM_Odm)
u8 i; u8 i;
struct sta_info *pEntry; struct sta_info *pEntry;
if (*pDM_Odm->pBandWidth == ODM_BW40M) { if (*pDM_Odm->pBandWidth == HT_CHANNEL_WIDTH_40) {
if (*pDM_Odm->pSecChOffset == 1) if (*pDM_Odm->pSecChOffset == 1)
pDM_Odm->ControlChannel = *pDM_Odm->pChannel - 2; pDM_Odm->ControlChannel = *pDM_Odm->pChannel - 2;
else if (*pDM_Odm->pSecChOffset == 2) else if (*pDM_Odm->pSecChOffset == 2)
...@@ -766,7 +766,7 @@ u32 ODM_Get_Rate_Bitmap(struct odm_dm_struct *pDM_Odm, u32 macid, u32 ra_mask, u ...@@ -766,7 +766,7 @@ u32 ODM_Get_Rate_Bitmap(struct odm_dm_struct *pDM_Odm, u32 macid, u32 ra_mask, u
} else if (rssi_level == DM_RATR_STA_MIDDLE) { } else if (rssi_level == DM_RATR_STA_MIDDLE) {
rate_bitmap = 0x000ff000; rate_bitmap = 0x000ff000;
} else { } else {
if (*pDM_Odm->pBandWidth == ODM_BW40M) if (*pDM_Odm->pBandWidth == HT_CHANNEL_WIDTH_40)
rate_bitmap = 0x000ff015; rate_bitmap = 0x000ff015;
else else
rate_bitmap = 0x000ff005; rate_bitmap = 0x000ff005;
......
...@@ -164,12 +164,6 @@ enum odm_wireless_mode { ...@@ -164,12 +164,6 @@ enum odm_wireless_mode {
ODM_WM_AUTO = BIT(5), ODM_WM_AUTO = BIT(5),
}; };
/* ODM_CMNINFO_BW */
enum odm_bw {
ODM_BW20M = 0,
ODM_BW40M = 1,
};
struct odm_ra_info { struct odm_ra_info {
u8 RateID; u8 RateID;
u32 RateMask; u32 RateMask;
......
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