Commit bf51cb67 authored by Jes Sorensen's avatar Jes Sorensen Committed by Greg Kroah-Hartman

staging: rtl8723au: Remove duplicate defines of IEEE80211_HT_PARAM_CHA_SEC_*

Signed-off-by: default avatarJes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2a907fe4
...@@ -153,14 +153,12 @@ inline u8 *rtw_set_ie23a_ch_switch (u8 *buf, u32 *buf_len, u8 ch_switch_mode, ...@@ -153,14 +153,12 @@ inline u8 *rtw_set_ie23a_ch_switch (u8 *buf, u32 *buf_len, u8 ch_switch_mode,
inline u8 hal_ch_offset_to_secondary_ch_offset23a(u8 ch_offset) inline u8 hal_ch_offset_to_secondary_ch_offset23a(u8 ch_offset)
{ {
if (ch_offset == HAL_PRIME_CHNL_OFFSET_DONT_CARE) if (ch_offset == HAL_PRIME_CHNL_OFFSET_LOWER)
return SCN; return IEEE80211_HT_PARAM_CHA_SEC_BELOW;
else if (ch_offset == HAL_PRIME_CHNL_OFFSET_LOWER)
return SCB;
else if (ch_offset == HAL_PRIME_CHNL_OFFSET_UPPER) else if (ch_offset == HAL_PRIME_CHNL_OFFSET_UPPER)
return SCA; return IEEE80211_HT_PARAM_CHA_SEC_ABOVE;
return SCN; return IEEE80211_HT_PARAM_CHA_SEC_NONE;
} }
inline u8 *rtw_set_ie23a_secondary_ch_offset(u8 *buf, u32 *buf_len, inline u8 *rtw_set_ie23a_secondary_ch_offset(u8 *buf, u32 *buf_len,
......
...@@ -390,11 +390,6 @@ struct rtw_ieee80211_channel { ...@@ -390,11 +390,6 @@ struct rtw_ieee80211_channel {
u8 *rtw_set_ie23a(u8 *pbuf, int index, uint len, const u8 *source, uint *frlen); u8 *rtw_set_ie23a(u8 *pbuf, int index, uint len, const u8 *source, uint *frlen);
enum secondary_ch_offset {
SCN = 0, /* no secondary channel */
SCA = 1, /* secondary channel above */
SCB = 3, /* secondary channel below */
};
u8 hal_ch_offset_to_secondary_ch_offset23a(u8 ch_offset); u8 hal_ch_offset_to_secondary_ch_offset23a(u8 ch_offset);
u8 *rtw_set_ie23a_ch_switch(u8 *buf, u32 *buf_len, u8 ch_switch_mode, u8 new_ch, u8 ch_switch_cnt); u8 *rtw_set_ie23a_ch_switch(u8 *buf, u32 *buf_len, u8 ch_switch_mode, u8 new_ch, u8 ch_switch_cnt);
u8 *rtw_set_ie23a_secondary_ch_offset(u8 *buf, u32 *buf_len, u8 secondary_ch_offset); u8 *rtw_set_ie23a_secondary_ch_offset(u8 *buf, u32 *buf_len, u8 secondary_ch_offset);
......
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