Commit b311b98d authored by Fox Chen's avatar Fox Chen Committed by Greg Kroah-Hartman

staging: rtl8723bs: Cleanup open brace issues

This cleans up open brace issues reported by checkpatch.pl
Signed-off-by: default avatarFox Chen <foxhlchen@gmail.com>
Link: https://lore.kernel.org/r/20200723093002.6175-1-foxhlchen@gmail.comSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d05c9a9e
...@@ -82,14 +82,12 @@ ...@@ -82,14 +82,12 @@
#define PWR_CUT_ALL_MSK 0xFF #define PWR_CUT_ALL_MSK 0xFF
typedef enum _PWRSEQ_CMD_DELAY_UNIT_ typedef enum _PWRSEQ_CMD_DELAY_UNIT_ {
{
PWRSEQ_DELAY_US, PWRSEQ_DELAY_US,
PWRSEQ_DELAY_MS, PWRSEQ_DELAY_MS,
} PWRSEQ_DELAY_UNIT; } PWRSEQ_DELAY_UNIT;
typedef struct _WL_PWR_CFG_ typedef struct _WL_PWR_CFG_ {
{
u16 offset; u16 offset;
u8 cut_msk; u8 cut_msk;
u8 fab_msk:4; u8 fab_msk:4;
......
...@@ -8,8 +8,7 @@ ...@@ -8,8 +8,7 @@
#define __HAL_VERSION_DEF_H__ #define __HAL_VERSION_DEF_H__
/* HAL_IC_TYPE_E */ /* HAL_IC_TYPE_E */
typedef enum tag_HAL_IC_Type_Definition typedef enum tag_HAL_IC_Type_Definition {
{
CHIP_8192S = 0, CHIP_8192S = 0,
CHIP_8188C = 1, CHIP_8188C = 1,
CHIP_8192C = 2, CHIP_8192C = 2,
...@@ -23,16 +22,14 @@ typedef enum tag_HAL_IC_Type_Definition ...@@ -23,16 +22,14 @@ typedef enum tag_HAL_IC_Type_Definition
} HAL_IC_TYPE_E; } HAL_IC_TYPE_E;
/* HAL_CHIP_TYPE_E */ /* HAL_CHIP_TYPE_E */
typedef enum tag_HAL_CHIP_Type_Definition typedef enum tag_HAL_CHIP_Type_Definition {
{
TEST_CHIP = 0, TEST_CHIP = 0,
NORMAL_CHIP = 1, NORMAL_CHIP = 1,
FPGA = 2, FPGA = 2,
} HAL_CHIP_TYPE_E; } HAL_CHIP_TYPE_E;
/* HAL_CUT_VERSION_E */ /* HAL_CUT_VERSION_E */
typedef enum tag_HAL_Cut_Version_Definition typedef enum tag_HAL_Cut_Version_Definition {
{
A_CUT_VERSION = 0, A_CUT_VERSION = 0,
B_CUT_VERSION = 1, B_CUT_VERSION = 1,
C_CUT_VERSION = 2, C_CUT_VERSION = 2,
...@@ -47,15 +44,13 @@ typedef enum tag_HAL_Cut_Version_Definition ...@@ -47,15 +44,13 @@ typedef enum tag_HAL_Cut_Version_Definition
} HAL_CUT_VERSION_E; } HAL_CUT_VERSION_E;
/* HAL_Manufacturer */ /* HAL_Manufacturer */
typedef enum tag_HAL_Manufacturer_Version_Definition typedef enum tag_HAL_Manufacturer_Version_Definition {
{
CHIP_VENDOR_TSMC = 0, CHIP_VENDOR_TSMC = 0,
CHIP_VENDOR_UMC = 1, CHIP_VENDOR_UMC = 1,
CHIP_VENDOR_SMIC = 2, CHIP_VENDOR_SMIC = 2,
} HAL_VENDOR_E; } HAL_VENDOR_E;
typedef enum tag_HAL_RF_Type_Definition typedef enum tag_HAL_RF_Type_Definition {
{
RF_TYPE_1T1R = 0, RF_TYPE_1T1R = 0,
RF_TYPE_1T2R = 1, RF_TYPE_1T2R = 1,
RF_TYPE_2T2R = 2, RF_TYPE_2T2R = 2,
...@@ -66,8 +61,7 @@ typedef enum tag_HAL_RF_Type_Definition ...@@ -66,8 +61,7 @@ typedef enum tag_HAL_RF_Type_Definition
RF_TYPE_4T4R = 7, RF_TYPE_4T4R = 7,
} HAL_RF_TYPE_E; } HAL_RF_TYPE_E;
typedef struct tag_HAL_VERSION typedef struct tag_HAL_VERSION {
{
HAL_IC_TYPE_E ICType; HAL_IC_TYPE_E ICType;
HAL_CHIP_TYPE_E ChipType; HAL_CHIP_TYPE_E ChipType;
HAL_CUT_VERSION_E CUTVersion; HAL_CUT_VERSION_E CUTVersion;
......
...@@ -86,8 +86,7 @@ struct specific_device_id { ...@@ -86,8 +86,7 @@ struct specific_device_id {
}; };
struct registry_priv struct registry_priv {
{
u8 chip_version; u8 chip_version;
u8 rfintfs; u8 rfintfs;
u8 lbkmode; u8 lbkmode;
...@@ -418,8 +417,7 @@ struct cam_entry_cache { ...@@ -418,8 +417,7 @@ struct cam_entry_cache {
((u8 *)(x))[6], ((u8 *)(x))[7], ((u8 *)(x))[8], ((u8 *)(x))[9], ((u8 *)(x))[10], ((u8 *)(x))[11], \ ((u8 *)(x))[6], ((u8 *)(x))[7], ((u8 *)(x))[8], ((u8 *)(x))[9], ((u8 *)(x))[10], ((u8 *)(x))[11], \
((u8 *)(x))[12], ((u8 *)(x))[13], ((u8 *)(x))[14], ((u8 *)(x))[15] ((u8 *)(x))[12], ((u8 *)(x))[13], ((u8 *)(x))[14], ((u8 *)(x))[15]
struct dvobj_priv struct dvobj_priv {
{
/*-------- below is common data --------*/ /*-------- below is common data --------*/
struct adapter *if1; /* PRIMARY_ADAPTER */ struct adapter *if1; /* PRIMARY_ADAPTER */
struct adapter *if2; /* SECONDARY_ADAPTER */ struct adapter *if2; /* SECONDARY_ADAPTER */
......
...@@ -16,8 +16,7 @@ ...@@ -16,8 +16,7 @@
#include <linux/mmc/card.h> #include <linux/mmc/card.h>
#endif #endif
struct sdio_data struct sdio_data {
{
u8 func_number; u8 func_number;
u8 tx_block_mode; u8 tx_block_mode;
......
...@@ -11,8 +11,7 @@ ...@@ -11,8 +11,7 @@
/* Some variables can't get from outsrc BT-Coex, */ /* Some variables can't get from outsrc BT-Coex, */
/* so we need to save here */ /* so we need to save here */
typedef struct _BT_COEXIST typedef struct _BT_COEXIST {
{
u8 bBtExist; u8 bBtExist;
u8 btTotalAntNum; u8 btTotalAntNum;
u8 btChipType; u8 btChipType;
......
...@@ -288,8 +288,7 @@ void SetHalODMVar( ...@@ -288,8 +288,7 @@ void SetHalODMVar(
bool bSet); bool bSet);
#ifdef CONFIG_BACKGROUND_NOISE_MONITOR #ifdef CONFIG_BACKGROUND_NOISE_MONITOR
struct noise_info struct noise_info {
{
u8 bPauseDIG; u8 bPauseDIG;
u8 IGIValue; u8 IGIValue;
u32 max_time;/* ms */ u32 max_time;/* ms */
......
...@@ -152,8 +152,7 @@ typedef enum _RATR_TABLE_MODE { ...@@ -152,8 +152,7 @@ typedef enum _RATR_TABLE_MODE {
} RATR_TABLE_MODE, *PRATR_TABLE_MODE; } RATR_TABLE_MODE, *PRATR_TABLE_MODE;
enum NETWORK_TYPE enum NETWORK_TYPE {
{
WIRELESS_INVALID = 0, WIRELESS_INVALID = 0,
/* Sub-Element */ /* Sub-Element */
WIRELESS_11B = BIT(0), /* tx: cck only , rx: cck only, hw: cck */ WIRELESS_11B = BIT(0), /* tx: cck only , rx: cck only, hw: cck */
......
...@@ -61,8 +61,7 @@ struct rtw_wdev_nego_info { ...@@ -61,8 +61,7 @@ struct rtw_wdev_nego_info {
(nego_info)->conf_op_ch = 0; \ (nego_info)->conf_op_ch = 0; \
} while (0) } while (0)
struct rtw_wdev_priv struct rtw_wdev_priv {
{
struct wireless_dev *rtw_wdev; struct wireless_dev *rtw_wdev;
struct adapter *padapter; struct adapter *padapter;
......
...@@ -13,8 +13,7 @@ ...@@ -13,8 +13,7 @@
#define MAX_RECVBUF_SZ (10240) #define MAX_RECVBUF_SZ (10240)
struct phy_stat struct phy_stat {
{
unsigned int phydw0; unsigned int phydw0;
unsigned int phydw1; unsigned int phydw1;
......
...@@ -9,8 +9,7 @@ ...@@ -9,8 +9,7 @@
#include <rtl8192c_recv.h> #include <rtl8192c_recv.h>
typedef struct rxreport_8723b typedef struct rxreport_8723b {
{
/* DWORD 0 */ /* DWORD 0 */
u32 pktlen:14; u32 pktlen:14;
u32 crc32:1; u32 crc32:1;
...@@ -82,8 +81,7 @@ typedef struct rxreport_8723b ...@@ -82,8 +81,7 @@ typedef struct rxreport_8723b
u32 tsfl; u32 tsfl;
} RXREPORT, *PRXREPORT; } RXREPORT, *PRXREPORT;
typedef struct phystatus_8723b typedef struct phystatus_8723b {
{
u32 rxgain_a:7; u32 rxgain_a:7;
u32 trsw_a:1; u32 trsw_a:1;
u32 rxgain_b:7; u32 rxgain_b:7;
......
...@@ -59,8 +59,7 @@ ...@@ -59,8 +59,7 @@
/* */ /* */
/* defined for TX DESC Operation */ /* defined for TX DESC Operation */
/* */ /* */
typedef struct txdesc_8723b typedef struct txdesc_8723b {
{
/* Offset 0 */ /* Offset 0 */
u32 pktlen:16; u32 pktlen:16;
u32 offset:8; u32 offset:8;
......
...@@ -134,8 +134,7 @@ extern void rtw_free_cmd_priv(struct cmd_priv *pcmdpriv); ...@@ -134,8 +134,7 @@ extern void rtw_free_cmd_priv(struct cmd_priv *pcmdpriv);
extern void rtw_free_evt_priv(struct evt_priv *pevtpriv); extern void rtw_free_evt_priv(struct evt_priv *pevtpriv);
extern void rtw_evt_notify_isr(struct evt_priv *pevtpriv); extern void rtw_evt_notify_isr(struct evt_priv *pevtpriv);
enum rtw_drvextra_cmd_id enum rtw_drvextra_cmd_id {
{
NONE_WK_CID, NONE_WK_CID,
DYNAMIC_CHK_WK_CID, DYNAMIC_CHK_WK_CID,
DM_CTRL_WK_CID, DM_CTRL_WK_CID,
...@@ -159,8 +158,7 @@ enum rtw_drvextra_cmd_id ...@@ -159,8 +158,7 @@ enum rtw_drvextra_cmd_id
MAX_WK_CID MAX_WK_CID
}; };
enum LPS_CTRL_TYPE enum LPS_CTRL_TYPE {
{
LPS_CTRL_SCAN = 0, LPS_CTRL_SCAN = 0,
LPS_CTRL_JOINBSS = 1, LPS_CTRL_JOINBSS = 1,
LPS_CTRL_CONNECT = 2, LPS_CTRL_CONNECT = 2,
...@@ -530,8 +528,7 @@ struct getrfintfs_parm { ...@@ -530,8 +528,7 @@ struct getrfintfs_parm {
}; };
struct Tx_Beacon_param struct Tx_Beacon_param {
{
struct wlan_bssid_ex network; struct wlan_bssid_ex network;
}; };
...@@ -754,8 +751,7 @@ struct setassocrspextraie_parm { ...@@ -754,8 +751,7 @@ struct setassocrspextraie_parm {
}; };
struct addBaReq_parm struct addBaReq_parm {
{
unsigned int tid; unsigned int tid;
u8 addr[ETH_ALEN]; u8 addr[ETH_ALEN];
}; };
...@@ -768,33 +764,28 @@ struct set_ch_parm { ...@@ -768,33 +764,28 @@ struct set_ch_parm {
}; };
/*H2C Handler index: 59 */ /*H2C Handler index: 59 */
struct SetChannelPlan_param struct SetChannelPlan_param {
{
u8 channel_plan; u8 channel_plan;
}; };
/*H2C Handler index: 60 */ /*H2C Handler index: 60 */
struct LedBlink_param struct LedBlink_param {
{
void *pLed; void *pLed;
}; };
/*H2C Handler index: 61 */ /*H2C Handler index: 61 */
struct SetChannelSwitch_param struct SetChannelSwitch_param {
{
u8 new_ch_no; u8 new_ch_no;
}; };
/*H2C Handler index: 62 */ /*H2C Handler index: 62 */
struct TDLSoption_param struct TDLSoption_param {
{
u8 addr[ETH_ALEN]; u8 addr[ETH_ALEN];
u8 option; u8 option;
}; };
/*H2C Handler index: 64 */ /*H2C Handler index: 64 */
struct RunInThread_param struct RunInThread_param {
{
void (*func)(void*); void (*func)(void*);
void *context; void *context;
}; };
...@@ -881,8 +872,7 @@ struct _cmd_callback { ...@@ -881,8 +872,7 @@ struct _cmd_callback {
void (*callback)(struct adapter *padapter, struct cmd_obj *cmd); void (*callback)(struct adapter *padapter, struct cmd_obj *cmd);
}; };
enum rtw_h2c_cmd enum rtw_h2c_cmd {
{
GEN_CMD_CODE(_Read_MACREG), /*0*/ GEN_CMD_CODE(_Read_MACREG), /*0*/
GEN_CMD_CODE(_Write_MACREG), GEN_CMD_CODE(_Write_MACREG),
GEN_CMD_CODE(_Read_BBREG), GEN_CMD_CODE(_Read_BBREG),
......
...@@ -42,8 +42,7 @@ ...@@ -42,8 +42,7 @@
/* Besides, CustomerID of registry has precedence of that of EEPROM. */ /* Besides, CustomerID of registry has precedence of that of EEPROM. */
/* defined below. 060703, by rcnjko. */ /* defined below. 060703, by rcnjko. */
/* */ /* */
typedef enum _RT_CUSTOMER_ID typedef enum _RT_CUSTOMER_ID {
{
RT_CID_DEFAULT = 0, RT_CID_DEFAULT = 0,
RT_CID_8187_ALPHA0 = 1, RT_CID_8187_ALPHA0 = 1,
RT_CID_8187_SERCOMM_PS = 2, RT_CID_8187_SERCOMM_PS = 2,
...@@ -93,8 +92,7 @@ typedef enum _RT_CUSTOMER_ID ...@@ -93,8 +92,7 @@ typedef enum _RT_CUSTOMER_ID
RT_CID_DNI_BUFFALO = 46,/* add by page for NEC */ RT_CID_DNI_BUFFALO = 46,/* add by page for NEC */
} RT_CUSTOMER_ID, *PRT_CUSTOMER_ID; } RT_CUSTOMER_ID, *PRT_CUSTOMER_ID;
struct eeprom_priv struct eeprom_priv {
{
u8 bautoload_fail_flag; u8 bautoload_fail_flag;
u8 bloadfile_fail_flag; u8 bloadfile_fail_flag;
u8 bloadmac_fail_flag; u8 bloadmac_fail_flag;
......
...@@ -60,13 +60,11 @@ struct stadel_event { ...@@ -60,13 +60,11 @@ struct stadel_event {
int mac_id; int mac_id;
}; };
struct addba_event struct addba_event {
{
unsigned int tid; unsigned int tid;
}; };
struct wmm_event struct wmm_event {
{
unsigned char wmm; unsigned char wmm;
}; };
......
...@@ -8,8 +8,7 @@ ...@@ -8,8 +8,7 @@
#define _RTW_HT_H_ #define _RTW_HT_H_
struct ht_priv struct ht_priv {
{
u8 ht_option; u8 ht_option;
u8 ampdu_enable;/* for enable Tx A-MPDU */ u8 ampdu_enable;/* for enable Tx A-MPDU */
u8 tx_amsdu_enable;/* for enable Tx A-MSDU */ u8 tx_amsdu_enable;/* for enable Tx A-MSDU */
......
...@@ -101,8 +101,7 @@ enum DriverInterface { ...@@ -101,8 +101,7 @@ enum DriverInterface {
DRIVER_CFG80211 = 2 DRIVER_CFG80211 = 2
}; };
enum SCAN_RESULT_TYPE enum SCAN_RESULT_TYPE {
{
SCAN_RESULT_P2P_ONLY = 0, /* Will return all the P2P devices. */ SCAN_RESULT_P2P_ONLY = 0, /* Will return all the P2P devices. */
SCAN_RESULT_ALL = 1, /* Will return all the scanned device, include AP. */ SCAN_RESULT_ALL = 1, /* Will return all the scanned device, include AP. */
SCAN_RESULT_WFD_TYPE = 2 /* Will just return the correct WFD device. */ SCAN_RESULT_WFD_TYPE = 2 /* Will just return the correct WFD device. */
...@@ -463,8 +462,7 @@ struct mlme_priv { ...@@ -463,8 +462,7 @@ struct mlme_priv {
void rtw_mlme_reset_auto_scan_int(struct adapter *adapter); void rtw_mlme_reset_auto_scan_int(struct adapter *adapter);
struct hostapd_priv struct hostapd_priv {
{
struct adapter *padapter; struct adapter *padapter;
}; };
......
...@@ -115,8 +115,7 @@ extern unsigned char WMM_PARA_OUI[]; ...@@ -115,8 +115,7 @@ extern unsigned char WMM_PARA_OUI[];
/* If you just wnat to customize the acitions(scan period or join actions) about one of the 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. */
/* */ /* */
typedef enum _RT_CHANNEL_DOMAIN typedef enum _RT_CHANNEL_DOMAIN {
{
/* old channel plan mapping ===== */ /* old channel plan mapping ===== */
RT_CHANNEL_DOMAIN_FCC = 0x00, RT_CHANNEL_DOMAIN_FCC = 0x00,
RT_CHANNEL_DOMAIN_IC = 0x01, RT_CHANNEL_DOMAIN_IC = 0x01,
...@@ -184,8 +183,7 @@ typedef enum _RT_CHANNEL_DOMAIN ...@@ -184,8 +183,7 @@ typedef enum _RT_CHANNEL_DOMAIN
RT_CHANNEL_DOMAIN_REALTEK_DEFINE = 0x7F, RT_CHANNEL_DOMAIN_REALTEK_DEFINE = 0x7F,
} RT_CHANNEL_DOMAIN, *PRT_CHANNEL_DOMAIN; } RT_CHANNEL_DOMAIN, *PRT_CHANNEL_DOMAIN;
typedef enum _RT_CHANNEL_DOMAIN_2G typedef enum _RT_CHANNEL_DOMAIN_2G {
{
RT_CHANNEL_DOMAIN_2G_WORLD = 0x00, /* Worldwird 13 */ RT_CHANNEL_DOMAIN_2G_WORLD = 0x00, /* Worldwird 13 */
RT_CHANNEL_DOMAIN_2G_ETSI1 = 0x01, /* Europe */ RT_CHANNEL_DOMAIN_2G_ETSI1 = 0x01, /* Europe */
RT_CHANNEL_DOMAIN_2G_FCC1 = 0x02, /* US */ RT_CHANNEL_DOMAIN_2G_FCC1 = 0x02, /* US */
...@@ -197,8 +195,7 @@ typedef enum _RT_CHANNEL_DOMAIN_2G ...@@ -197,8 +195,7 @@ typedef enum _RT_CHANNEL_DOMAIN_2G
RT_CHANNEL_DOMAIN_2G_MAX, RT_CHANNEL_DOMAIN_2G_MAX,
} RT_CHANNEL_DOMAIN_2G, *PRT_CHANNEL_DOMAIN_2G; } RT_CHANNEL_DOMAIN_2G, *PRT_CHANNEL_DOMAIN_2G;
typedef enum _RT_CHANNEL_DOMAIN_5G typedef enum _RT_CHANNEL_DOMAIN_5G {
{
RT_CHANNEL_DOMAIN_5G_NULL = 0x00, RT_CHANNEL_DOMAIN_5G_NULL = 0x00,
RT_CHANNEL_DOMAIN_5G_ETSI1 = 0x01, /* Europe */ RT_CHANNEL_DOMAIN_5G_ETSI1 = 0x01, /* Europe */
RT_CHANNEL_DOMAIN_5G_ETSI2 = 0x02, /* Australia, New Zealand */ RT_CHANNEL_DOMAIN_5G_ETSI2 = 0x02, /* Australia, New Zealand */
...@@ -241,32 +238,27 @@ typedef enum _RT_CHANNEL_DOMAIN_5G ...@@ -241,32 +238,27 @@ typedef enum _RT_CHANNEL_DOMAIN_5G
#define rtw_is_channel_plan_valid(chplan) (chplan < RT_CHANNEL_DOMAIN_MAX || chplan == RT_CHANNEL_DOMAIN_REALTEK_DEFINE) #define rtw_is_channel_plan_valid(chplan) (chplan < RT_CHANNEL_DOMAIN_MAX || chplan == RT_CHANNEL_DOMAIN_REALTEK_DEFINE)
typedef struct _RT_CHANNEL_PLAN typedef struct _RT_CHANNEL_PLAN {
{
unsigned char Channel[MAX_CHANNEL_NUM]; unsigned char Channel[MAX_CHANNEL_NUM];
unsigned char Len; unsigned char Len;
} RT_CHANNEL_PLAN, *PRT_CHANNEL_PLAN; } RT_CHANNEL_PLAN, *PRT_CHANNEL_PLAN;
typedef struct _RT_CHANNEL_PLAN_2G typedef struct _RT_CHANNEL_PLAN_2G {
{
unsigned char Channel[MAX_CHANNEL_NUM_2G]; unsigned char Channel[MAX_CHANNEL_NUM_2G];
unsigned char Len; unsigned char Len;
} RT_CHANNEL_PLAN_2G, *PRT_CHANNEL_PLAN_2G; } RT_CHANNEL_PLAN_2G, *PRT_CHANNEL_PLAN_2G;
typedef struct _RT_CHANNEL_PLAN_5G typedef struct _RT_CHANNEL_PLAN_5G {
{
unsigned char Channel[MAX_CHANNEL_NUM_5G]; unsigned char Channel[MAX_CHANNEL_NUM_5G];
unsigned char Len; unsigned char Len;
} RT_CHANNEL_PLAN_5G, *PRT_CHANNEL_PLAN_5G; } RT_CHANNEL_PLAN_5G, *PRT_CHANNEL_PLAN_5G;
typedef struct _RT_CHANNEL_PLAN_MAP typedef struct _RT_CHANNEL_PLAN_MAP {
{
unsigned char Index2G; unsigned char Index2G;
unsigned char Index5G; unsigned char Index5G;
} RT_CHANNEL_PLAN_MAP, *PRT_CHANNEL_PLAN_MAP; } RT_CHANNEL_PLAN_MAP, *PRT_CHANNEL_PLAN_MAP;
enum Associated_AP enum Associated_AP {
{
atherosAP = 0, atherosAP = 0,
broadcomAP = 1, broadcomAP = 1,
ciscoAP = 2, ciscoAP = 2,
...@@ -278,8 +270,7 @@ enum Associated_AP ...@@ -278,8 +270,7 @@ enum Associated_AP
maxAP, maxAP,
}; };
typedef enum _HT_IOT_PEER typedef enum _HT_IOT_PEER {
{
HT_IOT_PEER_UNKNOWN = 0, HT_IOT_PEER_UNKNOWN = 0,
HT_IOT_PEER_REALTEK = 1, HT_IOT_PEER_REALTEK = 1,
HT_IOT_PEER_REALTEK_92SE = 2, HT_IOT_PEER_REALTEK_92SE = 2,
...@@ -302,8 +293,7 @@ typedef enum _HT_IOT_PEER ...@@ -302,8 +293,7 @@ typedef enum _HT_IOT_PEER
} HT_IOT_PEER_E, *PHTIOT_PEER_E; } HT_IOT_PEER_E, *PHTIOT_PEER_E;
enum SCAN_STATE enum SCAN_STATE {
{
SCAN_DISABLE = 0, SCAN_DISABLE = 0,
SCAN_START = 1, SCAN_START = 1,
SCAN_TXNULL = 2, SCAN_TXNULL = 2,
...@@ -324,8 +314,7 @@ struct action_handler { ...@@ -324,8 +314,7 @@ struct action_handler {
unsigned int (*func)(struct adapter *padapter, union recv_frame *precv_frame); unsigned int (*func)(struct adapter *padapter, union recv_frame *precv_frame);
}; };
struct ss_res struct ss_res {
{
int state; int state;
int bss_cnt; int bss_cnt;
int channel_idx; int channel_idx;
...@@ -355,8 +344,7 @@ struct ss_res ...@@ -355,8 +344,7 @@ struct ss_res
#define WIFI_FW_LINKING_STATE (WIFI_FW_AUTH_NULL | WIFI_FW_AUTH_STATE | WIFI_FW_AUTH_SUCCESS | WIFI_FW_ASSOC_STATE) #define WIFI_FW_LINKING_STATE (WIFI_FW_AUTH_NULL | WIFI_FW_AUTH_STATE | WIFI_FW_AUTH_SUCCESS | WIFI_FW_ASSOC_STATE)
struct FW_Sta_Info struct FW_Sta_Info {
{
struct sta_info *psta; struct sta_info *psta;
u32 status; u32 status;
u32 rx_pkt; u32 rx_pkt;
...@@ -382,8 +370,7 @@ struct FW_Sta_Info ...@@ -382,8 +370,7 @@ struct FW_Sta_Info
* 4. Back to channel 1 for 300 milliseconds * 4. Back to channel 1 for 300 milliseconds
* 5. ... and so on, till survey done. * 5. ... and so on, till survey done.
*/ */
struct mlme_ext_info struct mlme_ext_info {
{
u32 state; u32 state;
u32 reauth_count; u32 reauth_count;
u32 reassoc_count; u32 reassoc_count;
...@@ -430,8 +417,7 @@ struct mlme_ext_info ...@@ -430,8 +417,7 @@ struct mlme_ext_info
}; };
/* The channel information about this channel including joining, scanning, and power constraints. */ /* The channel information about this channel including joining, scanning, and power constraints. */
typedef struct _RT_CHANNEL_INFO typedef struct _RT_CHANNEL_INFO {
{
u8 ChannelNum; /* The channel number. */ u8 ChannelNum; /* The channel number. */
RT_SCAN_TYPE ScanType; /* Scan type such as passive or active scan. */ RT_SCAN_TYPE ScanType; /* Scan type such as passive or active scan. */
} RT_CHANNEL_INFO, *PRT_CHANNEL_INFO; } RT_CHANNEL_INFO, *PRT_CHANNEL_INFO;
...@@ -472,8 +458,7 @@ struct p2p_oper_class_map { ...@@ -472,8 +458,7 @@ struct p2p_oper_class_map {
enum { BW20, BW40PLUS, BW40MINUS } bw; enum { BW20, BW40PLUS, BW40MINUS } bw;
}; };
struct mlme_ext_priv struct mlme_ext_priv {
{
struct adapter *padapter; struct adapter *padapter;
u8 mlmeext_init; u8 mlmeext_init;
atomic_t event_seq; atomic_t event_seq;
...@@ -786,8 +771,7 @@ u8 run_in_thread_hdl(struct adapter *padapter, u8 *pbuf); ...@@ -786,8 +771,7 @@ u8 run_in_thread_hdl(struct adapter *padapter, u8 *pbuf);
#define GEN_DRV_CMD_HANDLER(size, cmd) {size, &cmd ## _hdl}, #define GEN_DRV_CMD_HANDLER(size, cmd) {size, &cmd ## _hdl},
#define GEN_MLME_EXT_HANDLER(size, cmd) {size, cmd}, #define GEN_MLME_EXT_HANDLER(size, cmd) {size, cmd},
struct C2HEvent_Header struct C2HEvent_Header {
{
#ifdef __LITTLE_ENDIAN #ifdef __LITTLE_ENDIAN
...@@ -805,8 +789,7 @@ struct C2HEvent_Header ...@@ -805,8 +789,7 @@ struct C2HEvent_Header
void rtw_dummy_event_callback(struct adapter *adapter, u8 *pbuf); void rtw_dummy_event_callback(struct adapter *adapter, u8 *pbuf);
void rtw_fwdbg_event_callback(struct adapter *adapter, u8 *pbuf); void rtw_fwdbg_event_callback(struct adapter *adapter, u8 *pbuf);
enum rtw_c2h_event enum rtw_c2h_event {
{
GEN_EVT_CODE(_Read_MACREG) = 0, /*0*/ GEN_EVT_CODE(_Read_MACREG) = 0, /*0*/
GEN_EVT_CODE(_Read_BBREG), GEN_EVT_CODE(_Read_BBREG),
GEN_EVT_CODE(_Read_RFREG), GEN_EVT_CODE(_Read_RFREG),
......
...@@ -10,8 +10,7 @@ ...@@ -10,8 +10,7 @@
#define MAX_MP_XMITBUF_SZ 2048 #define MAX_MP_XMITBUF_SZ 2048
#define NR_MP_XMITFRAME 8 #define NR_MP_XMITFRAME 8
struct mp_xmit_frame struct mp_xmit_frame {
{
struct list_head list; struct list_head list;
struct pkt_attrib attrib; struct pkt_attrib attrib;
...@@ -25,8 +24,7 @@ struct mp_xmit_frame ...@@ -25,8 +24,7 @@ struct mp_xmit_frame
uint mem[(MAX_MP_XMITBUF_SZ >> 2)]; uint mem[(MAX_MP_XMITBUF_SZ >> 2)];
}; };
struct mp_wiparam struct mp_wiparam {
{
u32 bcompleted; u32 bcompleted;
u32 act_type; u32 act_type;
u32 io_offset; u32 io_offset;
...@@ -35,8 +33,7 @@ struct mp_wiparam ...@@ -35,8 +33,7 @@ struct mp_wiparam
typedef void(*wi_act_func)(void* padapter); typedef void(*wi_act_func)(void* padapter);
struct mp_tx struct mp_tx {
{
u8 stop; u8 stop;
u32 count, sended; u32 count, sended;
u8 payload; u8 payload;
...@@ -54,8 +51,7 @@ struct mp_tx ...@@ -54,8 +51,7 @@ struct mp_tx
#define MP_MAX_LINES_BYTES 256 #define MP_MAX_LINES_BYTES 256
typedef void (*MPT_WORK_ITEM_HANDLER)(void *Adapter); typedef void (*MPT_WORK_ITEM_HANDLER)(void *Adapter);
typedef struct _MPT_CONTEXT typedef struct _MPT_CONTEXT {
{
/* Indicate if we have started Mass Production Test. */ /* Indicate if we have started Mass Production Test. */
bool bMassProdTest; bool bMassProdTest;
...@@ -205,8 +201,7 @@ enum { ...@@ -205,8 +201,7 @@ enum {
MP_GET_TXPOWER_INX, MP_GET_TXPOWER_INX,
}; };
struct mp_priv struct mp_priv {
{
struct adapter *papdater; struct adapter *papdater;
/* Testing Flag */ /* Testing Flag */
......
...@@ -159,8 +159,7 @@ enum PS_DENY_REASON { ...@@ -159,8 +159,7 @@ enum PS_DENY_REASON {
}; };
#ifdef CONFIG_PNO_SUPPORT #ifdef CONFIG_PNO_SUPPORT
struct pno_nlo_info struct pno_nlo_info {
{
u32 fast_scan_period; /* Fast scan period */ u32 fast_scan_period; /* Fast scan period */
u32 ssid_num; /* number of entry */ u32 ssid_num; /* number of entry */
u32 slow_scan_period; /* slow scan period */ u32 slow_scan_period; /* slow scan period */
...@@ -179,16 +178,14 @@ struct pno_ssid_list { ...@@ -179,16 +178,14 @@ struct pno_ssid_list {
struct pno_ssid node[MAX_PNO_LIST_COUNT]; struct pno_ssid node[MAX_PNO_LIST_COUNT];
}; };
struct pno_scan_channel_info struct pno_scan_channel_info {
{
u8 channel; u8 channel;
u8 tx_power; u8 tx_power;
u8 timeout; u8 timeout;
u8 active; /* set 1 means active scan, or pasivite scan. */ u8 active; /* set 1 means active scan, or pasivite scan. */
}; };
struct pno_scan_info struct pno_scan_info {
{
u8 enableRFE; /* Enable RFE */ u8 enableRFE; /* Enable RFE */
u8 period_scan_time; /* exclusive with fast_scan_period and slow_scan_period */ u8 period_scan_time; /* exclusive with fast_scan_period and slow_scan_period */
u8 periodScan; /* exclusive with fast_scan_period and slow_scan_period */ u8 periodScan; /* exclusive with fast_scan_period and slow_scan_period */
...@@ -202,8 +199,7 @@ struct pno_scan_info ...@@ -202,8 +199,7 @@ struct pno_scan_info
}; };
#endif /* CONFIG_PNO_SUPPORT */ #endif /* CONFIG_PNO_SUPPORT */
struct pwrctrl_priv struct pwrctrl_priv {
{
struct mutex lock; struct mutex lock;
volatile u8 rpwm; /* requested power state for fw */ volatile u8 rpwm; /* requested power state for fw */
volatile u8 cpwm; /* fw current power state. updated when 1. read from HCPWM 2. driver lowers power level */ volatile u8 cpwm; /* fw current power state. updated when 1. read from HCPWM 2. driver lowers power level */
......
...@@ -40,8 +40,7 @@ ...@@ -40,8 +40,7 @@
#define MAX_SUBFRAME_COUNT 64 #define MAX_SUBFRAME_COUNT 64
/* for Rx reordering buffer control */ /* for Rx reordering buffer control */
struct recv_reorder_ctrl struct recv_reorder_ctrl {
{
struct adapter *padapter; struct adapter *padapter;
u8 enable; u8 enable;
u16 indicate_seq;/* wstart_b, init_value = 0xffff */ u16 indicate_seq;/* wstart_b, init_value = 0xffff */
...@@ -112,8 +111,7 @@ struct phy_info { ...@@ -112,8 +111,7 @@ struct phy_info {
}; };
#ifdef DBG_RX_SIGNAL_DISPLAY_RAW_DATA #ifdef DBG_RX_SIGNAL_DISPLAY_RAW_DATA
struct rx_raw_rssi struct rx_raw_rssi {
{
u8 data_rate; u8 data_rate;
u8 pwdball; u8 pwdball;
s8 pwr_all; s8 pwr_all;
...@@ -292,8 +290,7 @@ struct sta_recv_priv { ...@@ -292,8 +290,7 @@ struct sta_recv_priv {
}; };
struct recv_buf struct recv_buf {
{
struct list_head list; struct list_head list;
_lock recvbuf_lock; _lock recvbuf_lock;
...@@ -331,8 +328,7 @@ struct recv_buf ...@@ -331,8 +328,7 @@ struct recv_buf
len = (unsigned int)(tail - data); len = (unsigned int)(tail - data);
*/ */
struct recv_frame_hdr struct recv_frame_hdr {
{
struct list_head list; struct list_head list;
#ifndef CONFIG_BSD_RX_USE_MBUF #ifndef CONFIG_BSD_RX_USE_MBUF
struct sk_buff *pkt; struct sk_buff *pkt;
......
...@@ -87,8 +87,7 @@ union Keytype { ...@@ -87,8 +87,7 @@ union Keytype {
}; };
typedef struct _RT_PMKID_LIST typedef struct _RT_PMKID_LIST {
{
u8 bUsed; u8 bUsed;
u8 Bssid[6]; u8 Bssid[6];
u8 PMKID[16]; u8 PMKID[16];
...@@ -98,8 +97,7 @@ typedef struct _RT_PMKID_LIST ...@@ -98,8 +97,7 @@ typedef struct _RT_PMKID_LIST
} RT_PMKID_LIST, *PRT_PMKID_LIST; } RT_PMKID_LIST, *PRT_PMKID_LIST;
struct security_priv struct security_priv {
{
u32 dot11AuthAlgrthm; /* 802.11 auth, could be open, shared, 8021x and authswitch */ u32 dot11AuthAlgrthm; /* 802.11 auth, could be open, shared, 8021x and authswitch */
u32 dot11PrivacyAlgrthm; /* This specify the privacy for shared auth. algorithm. */ u32 dot11PrivacyAlgrthm; /* This specify the privacy for shared auth. algorithm. */
...@@ -273,8 +271,7 @@ do {\ ...@@ -273,8 +271,7 @@ do {\
#define ROL32(A, n) (((A) << (n)) | (((A)>>(32-(n))) & ((1UL << (n)) - 1))) #define ROL32(A, n) (((A) << (n)) | (((A)>>(32-(n))) & ((1UL << (n)) - 1)))
#define ROR32(A, n) ROL32((A), 32-(n)) #define ROR32(A, n) ROL32((A), 32-(n))
struct mic_data struct mic_data {
{
u32 K0, K1; /* Key */ u32 K0, K1; /* Key */
u32 L, R; /* Current state */ u32 L, R; /* Current state */
u32 M; /* Message accumulator (single word) */ u32 M; /* Message accumulator (single word) */
......
...@@ -137,8 +137,7 @@ struct hw_xmit { ...@@ -137,8 +137,7 @@ struct hw_xmit {
}; };
/* reduce size */ /* reduce size */
struct pkt_attrib struct pkt_attrib {
{
u8 type; u8 type;
u8 subtype; u8 subtype;
u8 bswenc; u8 bswenc;
...@@ -246,8 +245,7 @@ int rtw_sctx_wait(struct submit_ctx *sctx, const char *msg); ...@@ -246,8 +245,7 @@ int rtw_sctx_wait(struct submit_ctx *sctx, const char *msg);
void rtw_sctx_done_err(struct submit_ctx **sctx, int status); void rtw_sctx_done_err(struct submit_ctx **sctx, int status);
void rtw_sctx_done(struct submit_ctx **sctx); void rtw_sctx_done(struct submit_ctx **sctx);
struct xmit_buf struct xmit_buf {
{
struct list_head list; struct list_head list;
struct adapter *padapter; struct adapter *padapter;
...@@ -281,8 +279,7 @@ struct xmit_buf ...@@ -281,8 +279,7 @@ struct xmit_buf
}; };
struct xmit_frame struct xmit_frame {
{
struct list_head list; struct list_head list;
struct pkt_attrib attrib; struct pkt_attrib attrib;
...@@ -314,8 +311,7 @@ struct tx_servq { ...@@ -314,8 +311,7 @@ struct tx_servq {
}; };
struct sta_xmit_priv struct sta_xmit_priv {
{
_lock lock; _lock lock;
sint option; sint option;
sint apsd_setting; /* When bit mask is on, the associated edca queue supports APSD. */ sint apsd_setting; /* When bit mask is on, the associated edca queue supports APSD. */
......
...@@ -688,12 +688,9 @@ struct ieee80211_ht_addt_info { ...@@ -688,12 +688,9 @@ struct ieee80211_ht_addt_info {
} __attribute__ ((packed)); } __attribute__ ((packed));
struct HT_caps_element struct HT_caps_element {
{ union {
union struct {
{
struct
{
__le16 HT_caps_info; __le16 HT_caps_info;
unsigned char AMPDU_para; unsigned char AMPDU_para;
unsigned char MCS_rate[16]; unsigned char MCS_rate[16];
...@@ -705,29 +702,25 @@ struct HT_caps_element ...@@ -705,29 +702,25 @@ struct HT_caps_element
} u; } u;
} __attribute__ ((packed)); } __attribute__ ((packed));
struct HT_info_element struct HT_info_element {
{
unsigned char primary_channel; unsigned char primary_channel;
unsigned char infos[5]; unsigned char infos[5];
unsigned char MCS_rate[16]; unsigned char MCS_rate[16];
} __attribute__ ((packed)); } __attribute__ ((packed));
struct AC_param struct AC_param {
{
unsigned char ACI_AIFSN; unsigned char ACI_AIFSN;
unsigned char CW; unsigned char CW;
__le16 TXOP_limit; __le16 TXOP_limit;
} __attribute__ ((packed)); } __attribute__ ((packed));
struct WMM_para_element struct WMM_para_element {
{
unsigned char QoS_info; unsigned char QoS_info;
unsigned char reserved; unsigned char reserved;
struct AC_param ac_param[4]; struct AC_param ac_param[4];
} __attribute__ ((packed)); } __attribute__ ((packed));
struct ADDBA_request struct ADDBA_request {
{
unsigned char dialog_token; unsigned char dialog_token;
__le16 BA_para_set; __le16 BA_para_set;
__le16 BA_timeout_value; __le16 BA_timeout_value;
...@@ -1090,8 +1083,7 @@ enum P2P_WPSINFO { ...@@ -1090,8 +1083,7 @@ enum P2P_WPSINFO {
#define P2P_PRIVATE_IOCTL_SET_LEN 64 #define P2P_PRIVATE_IOCTL_SET_LEN 64
enum P2P_PROTO_WK_ID enum P2P_PROTO_WK_ID {
{
P2P_FIND_PHASE_WK = 0, P2P_FIND_PHASE_WK = 0,
P2P_RESTORE_STATE_WK = 1, P2P_RESTORE_STATE_WK = 1,
P2P_PRE_TX_PROVDISC_PROCESS_WK = 2, P2P_PRE_TX_PROVDISC_PROCESS_WK = 2,
......
...@@ -127,8 +127,7 @@ struct ndis_801_11_ai_resfi { ...@@ -127,8 +127,7 @@ struct ndis_801_11_ai_resfi {
u16 AssociationId; u16 AssociationId;
}; };
typedef struct _NDIS_802_11_ASSOCIATION_INFORMATION typedef struct _NDIS_802_11_ASSOCIATION_INFORMATION {
{
u32 Length; u32 Length;
u16 AvailableRequestFixedIEs; u16 AvailableRequestFixedIEs;
struct ndis_802_11_ai_reqfi RequestFixedIEs; struct ndis_802_11_ai_reqfi RequestFixedIEs;
...@@ -146,8 +145,7 @@ enum NDIS_802_11_RELOAD_DEFAULTS { ...@@ -146,8 +145,7 @@ enum NDIS_802_11_RELOAD_DEFAULTS {
/* Key mapping keys require a BSSID */ /* Key mapping keys require a BSSID */
typedef struct _NDIS_802_11_KEY typedef struct _NDIS_802_11_KEY {
{
u32 Length; /* Length of this structure */ u32 Length; /* Length of this structure */
u32 KeyIndex; u32 KeyIndex;
u32 KeyLength; /* length of key in bytes */ u32 KeyLength; /* length of key in bytes */
...@@ -156,8 +154,7 @@ typedef struct _NDIS_802_11_KEY ...@@ -156,8 +154,7 @@ typedef struct _NDIS_802_11_KEY
u8 KeyMaterial[32]; /* variable length depending on above field */ u8 KeyMaterial[32]; /* variable length depending on above field */
} NDIS_802_11_KEY, *PNDIS_802_11_KEY; } NDIS_802_11_KEY, *PNDIS_802_11_KEY;
typedef struct _NDIS_802_11_REMOVE_KEY typedef struct _NDIS_802_11_REMOVE_KEY {
{
u32 Length; /* Length of this structure */ u32 Length; /* Length of this structure */
u32 KeyIndex; u32 KeyIndex;
NDIS_802_11_MAC_ADDRESS BSSID; NDIS_802_11_MAC_ADDRESS BSSID;
......
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