Staging: rtl8723bs: fix names in rtw_mlme_ext.h

This commit converts names of structs / enums
in include/rtw_mlme_ext.h from ALL_CAPS format to lowercase

Signed-off-by: Marco Cesati <marcocesati@gmail.com>
Link: https://lore.kernel.org/r/20210317222130.29528-21-marcocesati@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
index 416268f26dc312a43d0d37b5a1b925ed86d0e11b..7bd75744bcb27b8ca9b50a98d0977b56ad557828 100644 (file)
--- a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
+++ b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
@@ -71,7 +71,7 @@ static unsigned char REALTEK_96B_IE[] = {0x00, 0xe0, 0x4c, 0x02, 0x01, 0x20};
 /********************************************************
 ChannelPlan definitions
 *********************************************************/
-static struct RT_CHANNEL_PLAN_2G       RTW_ChannelPlan2G[RT_CHANNEL_DOMAIN_2G_MAX] = {
+static struct rt_channel_plan_2g       RTW_ChannelPlan2G[RT_CHANNEL_DOMAIN_2G_MAX] = {
        {{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13}, 13},              /*  0x00, RT_CHANNEL_DOMAIN_2G_WORLD , Passive scan CH 12, 13 */
        {{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13}, 13},              /*  0x01, RT_CHANNEL_DOMAIN_2G_ETSI1 */
        {{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11}, 11},                      /*  0x02, RT_CHANNEL_DOMAIN_2G_FCC1 */
@@ -81,7 +81,7 @@ static struct RT_CHANNEL_PLAN_2G      RTW_ChannelPlan2G[RT_CHANNEL_DOMAIN_2G_MAX] = {
        {{}, 0},                                                                /*  0x06, RT_CHANNEL_DOMAIN_2G_NULL */
 };
 
-static struct RT_CHANNEL_PLAN_5G       RTW_ChannelPlan5G[RT_CHANNEL_DOMAIN_5G_MAX] = {
+static struct rt_channel_plan_5g       RTW_ChannelPlan5G[RT_CHANNEL_DOMAIN_5G_MAX] = {
        {{}, 0},                                                                                                                                                                        /*  0x00, RT_CHANNEL_DOMAIN_5G_NULL */
        {{36, 40, 44, 48, 52, 56, 60, 64, 100, 104, 108, 112, 116, 120, 124, 128, 132, 136, 140}, 19},                                          /*  0x01, RT_CHANNEL_DOMAIN_5G_ETSI1 */
        {{36, 40, 44, 48, 52, 56, 60, 64, 100, 104, 108, 112, 116, 120, 124, 128, 132, 136, 140, 149, 153, 157, 161, 165}, 24}, /*  0x02, RT_CHANNEL_DOMAIN_5G_ETSI2 */
@@ -121,7 +121,7 @@ static struct RT_CHANNEL_PLAN_5G    RTW_ChannelPlan5G[RT_CHANNEL_DOMAIN_5G_MAX] = {
        {{36, 40, 44, 48, 149, 153, 157, 161}, 8},                                                                                                                      /*  0x22, RT_CHANNEL_DOMAIN_5G_FCC4_NO_DFS */
 };
 
-static struct RT_CHANNEL_PLAN_MAP      RTW_ChannelPlanMap[RT_CHANNEL_DOMAIN_MAX] = {
+static struct rt_channel_plan_map      RTW_ChannelPlanMap[RT_CHANNEL_DOMAIN_MAX] = {
        /*  0x00 ~ 0x1F , Old Define ===== */
        {0x02, 0x20},   /* 0x00, RT_CHANNEL_DOMAIN_FCC */
        {0x02, 0x0A},   /* 0x01, RT_CHANNEL_DOMAIN_IC */
@@ -209,7 +209,7 @@ static struct RT_CHANNEL_PLAN_MAP   RTW_ChannelPlanMap[RT_CHANNEL_DOMAIN_MAX] = {
 };
 
  /* use the combination for max channel numbers */
-static struct RT_CHANNEL_PLAN_MAP RTW_CHANNEL_PLAN_MAP_REALTEK_DEFINE = {0x03, 0x02};
+static struct rt_channel_plan_map RTW_CHANNEL_PLAN_MAP_REALTEK_DEFINE = {0x03, 0x02};
 
 /* Search the @param ch in given @param ch_set
  * @ch_set: the given channel set
@@ -217,7 +217,7 @@ static struct RT_CHANNEL_PLAN_MAP RTW_CHANNEL_PLAN_MAP_REALTEK_DEFINE = {0x03, 0
  *
  * return the index of channel_num in channel_set, -1 if not found
  */
-int rtw_ch_set_search_ch(struct RT_CHANNEL_INFO *ch_set, const u32 ch)
+int rtw_ch_set_search_ch(struct rt_channel_info *ch_set, const u32 ch)
 {
        int i;
 
@@ -325,7 +325,7 @@ static void init_mlme_ext_priv_value(struct adapter *padapter)
        pmlmeext->action_public_dialog_token = 0xff;
 }
 
-static int has_channel(struct RT_CHANNEL_INFO *channel_set,
+static int has_channel(struct rt_channel_info *channel_set,
                                           u8 chanset_size,
                                           u8 chan)
 {
@@ -340,7 +340,7 @@ static int has_channel(struct RT_CHANNEL_INFO *channel_set,
        return 0;
 }
 
-static void init_channel_list(struct adapter *padapter, struct RT_CHANNEL_INFO *channel_set,
+static void init_channel_list(struct adapter *padapter, struct rt_channel_info *channel_set,
                                                          u8 chanset_size,
                                                          struct p2p_channels *channel_list)
 {
@@ -392,13 +392,13 @@ static void init_channel_list(struct adapter *padapter, struct RT_CHANNEL_INFO *
 
 }
 
-static u8 init_channel_set(struct adapter *padapter, u8 ChannelPlan, struct RT_CHANNEL_INFO *channel_set)
+static u8 init_channel_set(struct adapter *padapter, u8 ChannelPlan, struct rt_channel_info *channel_set)
 {
        u8 index, chanset_size = 0;
        u8 b5GBand = false, b2_4GBand = false;
        u8 Index2G = 0, Index5G = 0;
 
-       memset(channel_set, 0, sizeof(struct RT_CHANNEL_INFO)*MAX_CHANNEL_NUM);
+       memset(channel_set, 0, sizeof(struct rt_channel_info)*MAX_CHANNEL_NUM);
 
        if (ChannelPlan >= RT_CHANNEL_DOMAIN_MAX && ChannelPlan != RT_CHANNEL_DOMAIN_REALTEK_DEFINE) {
                DBG_871X("ChannelPlan ID %x error !!!!!\n", ChannelPlan);
@@ -4616,7 +4616,7 @@ static void process_80211d(struct adapter *padapter, struct wlan_bssid_ex *bssid
 {
        struct registry_priv *pregistrypriv;
        struct mlme_ext_priv *pmlmeext;
-       struct RT_CHANNEL_INFO *chplan_new;
+       struct rt_channel_info *chplan_new;
        u8 channel;
        u8 i;
 
@@ -4629,8 +4629,8 @@ static void process_80211d(struct adapter *padapter, struct wlan_bssid_ex *bssid
                (!pmlmeext->update_channel_plan_by_ap_done)) {
                u8 *ie, *p;
                u32 len;
-               struct RT_CHANNEL_PLAN chplan_ap;
-               struct RT_CHANNEL_INFO chplan_sta[MAX_CHANNEL_NUM];
+               struct rt_channel_plan chplan_ap;
+               struct rt_channel_info chplan_sta[MAX_CHANNEL_NUM];
                u8 country[4];
                u8 fcn; /*  first channel number */
                u8 noc; /*  number of channel */

diff --git a/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h b/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h
index 0f4dd33b6e555ac05412f5c12fdfa4647e6e86bb..fb283dc04ee2b36f03ad0f6efae41d7711509667 100644 (file)
--- a/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h
+++ b/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h
@@ -113,9 +113,9 @@ extern unsigned char WMM_PARA_OUI[];
 /*     We just add new channel plan when the new channel plan is different from any of the following */
 /*     channel plan. */
 /*     If you just wnat to customize the acitions(scan period or join actions) about one of the channel plan, */
-/*     customize them in RT_CHANNEL_INFO in the RT_CHANNEL_LIST. */
+/*     customize them in rt_channel_info in the RT_CHANNEL_LIST. */
 /*  */
-enum RT_CHANNEL_DOMAIN {
+enum rt_channel_domain {
        /*  old channel plan mapping ===== */
        RT_CHANNEL_DOMAIN_FCC = 0x00,
        RT_CHANNEL_DOMAIN_IC = 0x01,
@@ -183,7 +183,7 @@ enum RT_CHANNEL_DOMAIN {
        RT_CHANNEL_DOMAIN_REALTEK_DEFINE = 0x7F,
 };
 
-enum RT_CHANNEL_DOMAIN_2G {
+enum rt_channel_domain_2g {
        RT_CHANNEL_DOMAIN_2G_WORLD = 0x00,              /* Worldwird 13 */
        RT_CHANNEL_DOMAIN_2G_ETSI1 = 0x01,              /* Europe */
        RT_CHANNEL_DOMAIN_2G_FCC1 = 0x02,               /* US */
@@ -195,7 +195,7 @@ enum RT_CHANNEL_DOMAIN_2G {
        RT_CHANNEL_DOMAIN_2G_MAX,
 };
 
-enum RT_CHANNEL_DOMAIN_5G {
+enum rt_channel_domain_5g {
        RT_CHANNEL_DOMAIN_5G_NULL = 0x00,
        RT_CHANNEL_DOMAIN_5G_ETSI1 = 0x01,              /* Europe */
        RT_CHANNEL_DOMAIN_5G_ETSI2 = 0x02,              /* Australia, New Zealand */
@@ -238,22 +238,22 @@ enum RT_CHANNEL_DOMAIN_5G {
 
 #define rtw_is_channel_plan_valid(chplan) (chplan < RT_CHANNEL_DOMAIN_MAX || chplan == RT_CHANNEL_DOMAIN_REALTEK_DEFINE)
 
-struct RT_CHANNEL_PLAN {
+struct rt_channel_plan {
        unsigned char Channel[MAX_CHANNEL_NUM];
        unsigned char Len;
 };
 
-struct RT_CHANNEL_PLAN_2G {
+struct rt_channel_plan_2g {
        unsigned char Channel[MAX_CHANNEL_NUM_2G];
        unsigned char Len;
 };
 
-struct RT_CHANNEL_PLAN_5G {
+struct rt_channel_plan_5g {
        unsigned char Channel[MAX_CHANNEL_NUM_5G];
        unsigned char Len;
 };
 
-struct RT_CHANNEL_PLAN_MAP {
+struct rt_channel_plan_map {
        unsigned char Index2G;
        unsigned char Index5G;
 };
@@ -270,7 +270,7 @@ enum Associated_AP {
        maxAP,
 };
 
-enum HT_IOT_PEER_E {
+enum ht_iot_peer_e {
        HT_IOT_PEER_UNKNOWN                     = 0,
        HT_IOT_PEER_REALTEK                     = 1,
        HT_IOT_PEER_REALTEK_92SE                = 2,
@@ -293,7 +293,7 @@ enum HT_IOT_PEER_E {
 };
 
 
-enum SCAN_STATE {
+enum scan_state {
        SCAN_DISABLE = 0,
        SCAN_START = 1,
        SCAN_TXNULL = 2,
@@ -417,12 +417,12 @@ struct mlme_ext_info {
 };
 
 /*  The channel information about this channel including joining, scanning, and power constraints. */
-struct RT_CHANNEL_INFO {
+struct rt_channel_info {
        u8              ChannelNum;             /*  The channel number. */
        enum rt_scan_type       ScanType;               /*  Scan type such as passive or active scan. */
 };
 
-int rtw_ch_set_search_ch(struct RT_CHANNEL_INFO *ch_set, const u32 ch);
+int rtw_ch_set_search_ch(struct rt_channel_info *ch_set, const u32 ch);
 bool rtw_mlme_band_check(struct adapter *adapter, const u32 ch);
 
 /*  P2P_MAX_REG_CLASSES - Maximum number of regulatory classes */
@@ -474,7 +474,7 @@ struct mlme_ext_priv {
        unsigned char cur_wireless_mode;        /*  NETWORK_TYPE */
 
        unsigned char max_chan_nums;
-       struct RT_CHANNEL_INFO          channel_set[MAX_CHANNEL_NUM];
+       struct rt_channel_info          channel_set[MAX_CHANNEL_NUM];
        struct p2p_channels channel_list;
        unsigned char basicrate[NumRates];
        unsigned char datarate[NumRates];

diff --git a/drivers/staging/rtl8723bs/os_dep/wifi_regd.c b/drivers/staging/rtl8723bs/os_dep/wifi_regd.c
index b3d87a971398ae4ec9a72399d3bee421651de2be..ee55893528b97574d7259ace846b0bc18f6e9879 100644 (file)
--- a/drivers/staging/rtl8723bs/os_dep/wifi_regd.c
+++ b/drivers/staging/rtl8723bs/os_dep/wifi_regd.c
@@ -61,7 +61,7 @@ static void _rtw_reg_apply_flags(struct wiphy *wiphy)
 {
        struct adapter *padapter = wiphy_to_adapter(wiphy);
        struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
-       struct RT_CHANNEL_INFO *channel_set = pmlmeext->channel_set;
+       struct rt_channel_info *channel_set = pmlmeext->channel_set;
        u8 max_chan_nums = pmlmeext->max_chan_nums;
 
        struct ieee80211_supported_band *sband;