staging: rtl8723au: Remove duplicate defines of IEEE80211_HT_PARAM_CHA_SEC_*

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8723au/core/rtw_ieee80211.c b/drivers/staging/rtl8723au/core/rtw_ieee80211.c
index 922b45e3b42ad6fc467f7bc3aee42d9d71b58692..9d0662cb96d013157424c8aba244bc24ea0983d5 100644 (file)
--- a/drivers/staging/rtl8723au/core/rtw_ieee80211.c
+++ b/drivers/staging/rtl8723au/core/rtw_ieee80211.c
@@ -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)
 {
-       if (ch_offset == HAL_PRIME_CHNL_OFFSET_DONT_CARE)
-               return SCN;
-       else if (ch_offset == HAL_PRIME_CHNL_OFFSET_LOWER)
-               return SCB;
+       if (ch_offset == HAL_PRIME_CHNL_OFFSET_LOWER)
+               return IEEE80211_HT_PARAM_CHA_SEC_BELOW;
        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,

diff --git a/drivers/staging/rtl8723au/include/ieee80211.h b/drivers/staging/rtl8723au/include/ieee80211.h
index 9e03d411c2c476d1ba63442c8d4e43399217a3ad..cb3f4fa8c01d351d6555e4d305fdef3871ed047d 100644 (file)
--- a/drivers/staging/rtl8723au/include/ieee80211.h
+++ b/drivers/staging/rtl8723au/include/ieee80211.h
@@ -390,11 +390,6 @@ struct rtw_ieee80211_channel {
 
 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 *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);