staging: rtl8723au: Use kernel provided IEEE80211_HT_PARAM_* defines

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_ioctl_set.c b/drivers/staging/rtl8723au/core/rtw_ioctl_set.c
index 99a662d83fc1f990adf0ceed1a520a601d887494..f65443c62baf60d7319bda58715fa636481cb7ce 100644 (file)
--- a/drivers/staging/rtl8723au/core/rtw_ioctl_set.c
+++ b/drivers/staging/rtl8723au/core/rtw_ioctl_set.c
@@ -399,7 +399,7 @@ u16 rtw_get_cur_max_rate23a(struct rtw_adapter *adapter)
                        /* cur_bwmod is updated by beacon, pmlmeinfo is
                           updated by association response */
                        bw_40MHz = (pmlmeext->cur_bwmode &&
-                                   (HT_INFO_HT_PARAM_REC_TRANS_CHNL_WIDTH &
+                                   (IEEE80211_HT_PARAM_CHAN_WIDTH_ANY &
                                     pmlmeinfo->HT_info.infos[0])) ? 1:0;
 
                        /* short_GI = (pht_capie->cap_info & (IEEE80211_HT_CAP

diff --git a/drivers/staging/rtl8723au/include/wifi.h b/drivers/staging/rtl8723au/include/wifi.h
index bfe1eb36f179e5c46880b4da23629a6ef7ac7254..d7234838f4eeedf0f4862e5801043c0a52404bf0 100644 (file)
--- a/drivers/staging/rtl8723au/include/wifi.h
+++ b/drivers/staging/rtl8723au/include/wifi.h
@@ -233,14 +233,6 @@ struct ADDBA_request {
 #define OP_MODE_20MHZ_HT_STA_ASSOCED    2
 #define OP_MODE_MIXED                   3
 
-#define HT_INFO_HT_PARAM_SECONDARY_CHNL_OFF_MASK       ((u8) BIT(0) | BIT(1))
-#define HT_INFO_HT_PARAM_SECONDARY_CHNL_ABOVE          ((u8) BIT(0))
-#define HT_INFO_HT_PARAM_SECONDARY_CHNL_BELOW          ((u8) BIT(0) | BIT(1))
-#define HT_INFO_HT_PARAM_REC_TRANS_CHNL_WIDTH          ((u8) BIT(2))
-#define HT_INFO_HT_PARAM_RIFS_MODE                     ((u8) BIT(3))
-#define HT_INFO_HT_PARAM_CTRL_ACCESS_ONLY              ((u8) BIT(4))
-#define HT_INFO_HT_PARAM_SRV_INTERVAL_GRANULARITY      ((u8) BIT(5))
-
 /*     ===============WPS Section=============== */
 /*     For WPSv1.0 */
 #define WPSOUI                                 0x0050f204