53 lines
2.2 KiB
Diff
53 lines
2.2 KiB
Diff
From: Jes Sorensen <Jes.Sorensen@redhat.com>
|
|
Date: Mon, 9 Jun 2014 15:16:21 +0200
|
|
Subject: [042/249] staging: rtl8723au: Remove duplicate defines of
|
|
IEEE80211_HT_PARAM_CHA_SEC_*
|
|
Origin: https://git.kernel.org/linus/bf51cb6780a17b2ab64b6e6c0eacfc1b882a5d54
|
|
|
|
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
---
|
|
drivers/staging/rtl8723au/core/rtw_ieee80211.c | 10 ++++------
|
|
drivers/staging/rtl8723au/include/ieee80211.h | 5 -----
|
|
2 files changed, 4 insertions(+), 11 deletions(-)
|
|
|
|
diff --git a/drivers/staging/rtl8723au/core/rtw_ieee80211.c b/drivers/staging/rtl8723au/core/rtw_ieee80211.c
|
|
index 922b45e..9d0662c 100644
|
|
--- 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 9e03d41..cb3f4fa 100644
|
|
--- 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);
|