staging: rtl8723bs: rename bLinkInfoDump to snake_case
PATCH 1/1 staging: rtl8723bs: rename bLinkInfoDump to snake_case
Rename bLinkInfoDump to link_info_dump to follow the kernel coding style, which discourages CamelCase and Hungarian notation. Issue reported by checkpatch.pl.
Signed-off-by pastraman <[email protected]>
--- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 2337 ++++++++++------- drivers/staging/rtl8723bs/include/drv_types.h | 185 +- drivers/staging/rtl8723bs/os_dep/os_intfs.c | 149 +- 3 files changed, 1623 insertions(+), 1048 deletions(-)
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +1445 -892
@@ -12,155 +12,164 @@#include <linux/unaligned.h> static struct mlme_handler mlme_sta_tbl[] = { - {WIFI_ASSOCREQ ,"OnAssocReq" , &OnAssocReq}, - {WIFI_ASSOCRSP ,"OnAssocRsp" , &OnAssocRsp}, - {WIFI_REASSOCREQ ,"OnReAssocReq" , &OnAssocReq}, - {WIFI_REASSOCRSP ,"OnReAssocRsp" , &OnAssocRsp}, - {WIFI_PROBEREQ ,"OnProbeReq" , &OnProbeReq}, - {WIFI_PROBERSP ,"OnProbeRsp" , &OnProbeRsp}, + {WIFI_ASSOCREQ ,"OnAssocReq" , &OnAssocReq }, + {WIFI_ASSOCRSP ,"OnAssocRsp" , &OnAssocRsp }, + {WIFI_REASSOCREQ ,"OnReAssocReq" , &OnAssocReq }, + {WIFI_REASSOCRSP ,"OnReAssocRsp" , &OnAssocRsp }, + {WIFI_PROBEREQ ,"OnProbeReq" , &OnProbeReq }, + {WIFI_PROBERSP ,"OnProbeRsp" , &OnProbeRsp },/* below 2 are reserved */ - {0 ,"DoReserved" , &DoReserved}, - {0 ,"DoReserved" , &DoReserved}, - {WIFI_BEACON ,"OnBeacon" , &OnBeacon}, - {WIFI_ATIM ,"OnATIM" , &OnAtim}, - {WIFI_DISASSOC ,"OnDisassoc" , &OnDisassoc}, - {WIFI_AUTH ,"OnAuth" , &OnAuthClient}, - {WIFI_DEAUTH ,"OnDeAuth" , &OnDeAuth}, - {WIFI_ACTION ,"OnAction" , &OnAction}, - {WIFI_ACTION_NOACK ,"OnActionNoAck" , &OnAction}, + {0 ,"DoReserved" , &DoReserved }, + {0 ,"DoReserved" , &DoReserved }, + {WIFI_BEACON ,"OnBeacon" , &OnBeacon }, + {WIFI_ATIM ,"OnATIM" , &OnAtim }, + {WIFI_DISASSOC ,"OnDisassoc" , &OnDisassoc }, + {WIFI_AUTH ,"OnAuth" , &OnAuthClient }, + {WIFI_DEAUTH ,"OnDeAuth" , &OnDeAuth }, + {WIFI_ACTION ,"OnAction" , &OnAction }, + {WIFI_ACTION_NOACK ,"OnActionNoAck" , &OnAction }, };static struct action_handler OnAction_tbl[] = { - {RTW_WLAN_CATEGORY_SPECTRUM_MGMT ,"ACTION_SPECTRUM_MGMT" , on_action_spct}, - {RTW_WLAN_CATEGORY_QOS ,"ACTION_QOS" , &DoReserved}, - {RTW_WLAN_CATEGORY_DLS ,"ACTION_DLS" , &DoReserved}, - {RTW_WLAN_CATEGORY_BACK ,"ACTION_BACK" , &OnAction_back}, - {RTW_WLAN_CATEGORY_PUBLIC ,"ACTION_PUBLIC" , on_action_public}, - {RTW_WLAN_CATEGORY_RADIO_MEASUREMENT ,"ACTION_RADIO_MEASUREMENT" , &DoReserved}, - {RTW_WLAN_CATEGORY_FT ,"ACTION_FT" , &DoReserved}, - {RTW_WLAN_CATEGORY_HT ,"ACTION_HT" , &OnAction_ht}, - {RTW_WLAN_CATEGORY_SA_QUERY ,"ACTION_SA_QUERY" , &OnAction_sa_query}, - {RTW_WLAN_CATEGORY_UNPROTECTED_WNM ,"ACTION_UNPROTECTED_WNM" , &DoReserved}, - {RTW_WLAN_CATEGORY_SELF_PROTECTED ,"ACTION_SELF_PROTECTED" , &DoReserved}, - {RTW_WLAN_CATEGORY_WMM ,"ACTION_WMM" , &DoReserved}, - {RTW_WLAN_CATEGORY_P2P ,"ACTION_P2P" , &DoReserved}, + {RTW_WLAN_CATEGORY_SPECTRUM_MGMT ,"ACTION_SPECTRUM_MGMT" , + on_action_spct }, + {RTW_WLAN_CATEGORY_QOS ,"ACTION_QOS" , &DoReserved }, + {RTW_WLAN_CATEGORY_DLS ,"ACTION_DLS" , &DoReserved }, + {RTW_WLAN_CATEGORY_BACK ,"ACTION_BACK" , &OnAction_back }, + {RTW_WLAN_CATEGORY_PUBLIC ,"ACTION_PUBLIC" , on_action_public }, + {RTW_WLAN_CATEGORY_RADIO_MEASUREMENT ,"ACTION_RADIO_MEASUREMENT" , + &DoReserved }, + {RTW_WLAN_CATEGORY_FT ,"ACTION_FT" , &DoReserved }, + {RTW_WLAN_CATEGORY_HT ,"ACTION_HT" , &OnAction_ht }, + {RTW_WLAN_CATEGORY_SA_QUERY ,"ACTION_SA_QUERY" , &OnAction_sa_query }, + {RTW_WLAN_CATEGORY_UNPROTECTED_WNM ,"ACTION_UNPROTECTED_WNM" , + &DoReserved }, + {RTW_WLAN_CATEGORY_SELF_PROTECTED ,"ACTION_SELF_PROTECTED" , + &DoReserved }, + {RTW_WLAN_CATEGORY_WMM ,"ACTION_WMM" , &DoReserved }, + {RTW_WLAN_CATEGORY_P2P ,"ACTION_P2P" , &DoReserved }, }; -static u8 null_addr[ETH_ALEN ] = {0 ,0 ,0 ,0 ,0 ,0 }; +static u8 null_addr[ETH_ALEN ] = {0 ,0 ,0 ,0 ,0 ,0 };/* OUI definitions for the vendor specific IE */ -unsigned char RTW_WPA_OUI [] = {0x00 ,0x50 ,0xf2 ,0x01 }; -unsigned char WMM_OUI [] = {0x00 ,0x50 ,0xf2 ,0x02 }; -unsigned char WPS_OUI [] = {0x00 ,0x50 ,0xf2 ,0x04 }; -unsigned char P2P_OUI [] = {0x50 ,0x6F ,0x9A ,0x09 }; -unsigned char WFD_OUI [] = {0x50 ,0x6F ,0x9A ,0x0A }; +unsigned char RTW_WPA_OUI [] = {0x00 ,0x50 ,0xf2 ,0x01 }; +unsigned char WMM_OUI [] = {0x00 ,0x50 ,0xf2 ,0x02 }; +unsigned char WPS_OUI [] = {0x00 ,0x50 ,0xf2 ,0x04 }; +unsigned char P2P_OUI [] = {0x50 ,0x6F ,0x9A ,0x09 }; +unsigned char WFD_OUI [] = {0x50 ,0x6F ,0x9A ,0x0A }; -unsigned char WMM_INFO_OUI [] = {0x00 ,0x50 ,0xf2 ,0x02 ,0x00 ,0x01 }; -unsigned char WMM_PARA_OUI [] = {0x00 ,0x50 ,0xf2 ,0x02 ,0x01 ,0x01 }; +unsigned char WMM_INFO_OUI [] = {0x00 ,0x50 ,0xf2 ,0x02 ,0x00 ,0x01 }; +unsigned char WMM_PARA_OUI [] = {0x00 ,0x50 ,0xf2 ,0x02 ,0x01 ,0x01 }; -static unsigned char REALTEK_96B_IE [] = {0x00 ,0xe0 ,0x4c ,0x02 ,0x01 ,0x20 }; +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 ] = { - {{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 */ - {{1 ,2 ,3 ,4 ,5 ,6 ,7 ,8 ,9 ,10 ,11 ,12 ,13 ,14 },14 },/* 0x03, RT_CHANNEL_DOMAIN_2G_MIKK1 */ - {{10 ,11 ,12 ,13 },4 },/* 0x04, RT_CHANNEL_DOMAIN_2G_ETSI2 */ - {{1 ,2 ,3 ,4 ,5 ,6 ,7 ,8 ,9 ,10 ,11 ,12 ,13 ,14 },14 },/* 0x05, RT_CHANNEL_DOMAIN_2G_GLOBAL , Passive scan CH 12, 13, 14 */ - {{},0 },/* 0x06, RT_CHANNEL_DOMAIN_2G_NULL */ +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 */ + { {1 ,2 ,3 ,4 ,5 ,6 ,7 ,8 ,9 ,10 ,11 ,12 ,13 ,14 }, +14 },/* 0x03, RT_CHANNEL_DOMAIN_2G_MIKK1 */ + { {10 ,11 ,12 ,13 },4 },/* 0x04, RT_CHANNEL_DOMAIN_2G_ETSI2 */ + { {1 ,2 ,3 ,4 ,5 ,6 ,7 ,8 ,9 ,10 ,11 ,12 ,13 ,14 }, +14 },/* 0x05, RT_CHANNEL_DOMAIN_2G_GLOBAL , Passive scan CH 12, 13, 14 */ + { {},0 },/* 0x06, RT_CHANNEL_DOMAIN_2G_NULL */ }; -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 },/* 0x00, RT_CHANNEL_DOMAIN_FCC */ - {0x02 },/* 0x01, RT_CHANNEL_DOMAIN_IC */ - {0x01 },/* 0x02, RT_CHANNEL_DOMAIN_ETSI */ - {0x01 },/* 0x03, RT_CHANNEL_DOMAIN_SPAIN */ - {0x01 },/* 0x04, RT_CHANNEL_DOMAIN_FRANCE */ - {0x03 },/* 0x05, RT_CHANNEL_DOMAIN_MKK */ - {0x03 },/* 0x06, RT_CHANNEL_DOMAIN_MKK1 */ - {0x01 },/* 0x07, RT_CHANNEL_DOMAIN_ISRAEL */ - {0x03 },/* 0x08, RT_CHANNEL_DOMAIN_TELEC */ - {0x03 },/* 0x09, RT_CHANNEL_DOMAIN_GLOBAL_DOAMIN */ - {0x00 },/* 0x0A, RT_CHANNEL_DOMAIN_WORLD_WIDE_13 */ - {0x02 },/* 0x0B, RT_CHANNEL_DOMAIN_TAIWAN */ - {0x01 },/* 0x0C, RT_CHANNEL_DOMAIN_CHINA */ - {0x02 },/* 0x0D, RT_CHANNEL_DOMAIN_SINGAPORE_INDIA_MEXICO */ - {0x02 },/* 0x0E, RT_CHANNEL_DOMAIN_KOREA */ - {0x02 },/* 0x0F, RT_CHANNEL_DOMAIN_TURKEY */ - {0x01 },/* 0x10, RT_CHANNEL_DOMAIN_JAPAN */ - {0x02 },/* 0x11, RT_CHANNEL_DOMAIN_FCC_NO_DFS */ - {0x01 },/* 0x12, RT_CHANNEL_DOMAIN_JAPAN_NO_DFS */ - {0x00 },/* 0x13, RT_CHANNEL_DOMAIN_WORLD_WIDE_5G */ - {0x02 },/* 0x14, RT_CHANNEL_DOMAIN_TAIWAN_NO_DFS */ - {0x00 },/* 0x15, RT_CHANNEL_DOMAIN_ETSI_NO_DFS */ - {0x00 },/* 0x16, RT_CHANNEL_DOMAIN_KOREA_NO_DFS */ - {0x03 },/* 0x17, RT_CHANNEL_DOMAIN_JAPAN_NO_DFS */ - {0x06 },/* 0x18, RT_CHANNEL_DOMAIN_PAKISTAN_NO_DFS */ - {0x02 },/* 0x19, RT_CHANNEL_DOMAIN_TAIWAN2_NO_DFS */ - {0x00 },/* 0x1A, */ - {0x00 },/* 0x1B, */ - {0x00 },/* 0x1C, */ - {0x00 },/* 0x1D, */ - {0x00 },/* 0x1E, */ - {0x06 },/* 0x1F, RT_CHANNEL_DOMAIN_WORLD_WIDE_ONLY_5G */ + {0x02 },/* 0x00, RT_CHANNEL_DOMAIN_FCC */ + {0x02 },/* 0x01, RT_CHANNEL_DOMAIN_IC */ + {0x01 },/* 0x02, RT_CHANNEL_DOMAIN_ETSI */ + {0x01 },/* 0x03, RT_CHANNEL_DOMAIN_SPAIN */ + {0x01 },/* 0x04, RT_CHANNEL_DOMAIN_FRANCE */ + {0x03 },/* 0x05, RT_CHANNEL_DOMAIN_MKK */ + {0x03 },/* 0x06, RT_CHANNEL_DOMAIN_MKK1 */ + {0x01 },/* 0x07, RT_CHANNEL_DOMAIN_ISRAEL */ + {0x03 },/* 0x08, RT_CHANNEL_DOMAIN_TELEC */ + {0x03 },/* 0x09, RT_CHANNEL_DOMAIN_GLOBAL_DOAMIN */ + {0x00 },/* 0x0A, RT_CHANNEL_DOMAIN_WORLD_WIDE_13 */ + {0x02 },/* 0x0B, RT_CHANNEL_DOMAIN_TAIWAN */ + {0x01 },/* 0x0C, RT_CHANNEL_DOMAIN_CHINA */ + {0x02 },/* 0x0D, RT_CHANNEL_DOMAIN_SINGAPORE_INDIA_MEXICO */ + {0x02 },/* 0x0E, RT_CHANNEL_DOMAIN_KOREA */ + {0x02 },/* 0x0F, RT_CHANNEL_DOMAIN_TURKEY */ + {0x01 },/* 0x10, RT_CHANNEL_DOMAIN_JAPAN */ + {0x02 },/* 0x11, RT_CHANNEL_DOMAIN_FCC_NO_DFS */ + {0x01 },/* 0x12, RT_CHANNEL_DOMAIN_JAPAN_NO_DFS */ + {0x00 },/* 0x13, RT_CHANNEL_DOMAIN_WORLD_WIDE_5G */ + {0x02 },/* 0x14, RT_CHANNEL_DOMAIN_TAIWAN_NO_DFS */ + {0x00 },/* 0x15, RT_CHANNEL_DOMAIN_ETSI_NO_DFS */ + {0x00 },/* 0x16, RT_CHANNEL_DOMAIN_KOREA_NO_DFS */ + {0x03 },/* 0x17, RT_CHANNEL_DOMAIN_JAPAN_NO_DFS */ + {0x06 },/* 0x18, RT_CHANNEL_DOMAIN_PAKISTAN_NO_DFS */ + {0x02 },/* 0x19, RT_CHANNEL_DOMAIN_TAIWAN2_NO_DFS */ + {0x00 },/* 0x1A, */ + {0x00 },/* 0x1B, */ + {0x00 },/* 0x1C, */ + {0x00 },/* 0x1D, */ + {0x00 },/* 0x1E, */ + {0x06 },/* 0x1F, RT_CHANNEL_DOMAIN_WORLD_WIDE_ONLY_5G */ /* 0x20 ~ 0x7F , New Define ===== */ - {0x00 },/* 0x20, RT_CHANNEL_DOMAIN_WORLD_NULL */ - {0x01 },/* 0x21, RT_CHANNEL_DOMAIN_ETSI1_NULL */ - {0x02 },/* 0x22, RT_CHANNEL_DOMAIN_FCC1_NULL */ - {0x03 },/* 0x23, RT_CHANNEL_DOMAIN_MKK1_NULL */ - {0x04 },/* 0x24, RT_CHANNEL_DOMAIN_ETSI2_NULL */ - {0x02 },/* 0x25, RT_CHANNEL_DOMAIN_FCC1_FCC1 */ - {0x00 },/* 0x26, RT_CHANNEL_DOMAIN_WORLD_ETSI1 */ - {0x03 },/* 0x27, RT_CHANNEL_DOMAIN_MKK1_MKK1 */ - {0x00 },/* 0x28, RT_CHANNEL_DOMAIN_WORLD_KCC1 */ - {0x00 },/* 0x29, RT_CHANNEL_DOMAIN_WORLD_FCC2 */ - {0x00 },/* 0x2A, */ - {0x00 },/* 0x2B, */ - {0x00 },/* 0x2C, */ - {0x00 },/* 0x2D, */ - {0x00 },/* 0x2E, */ - {0x00 },/* 0x2F, */ - {0x00 },/* 0x30, RT_CHANNEL_DOMAIN_WORLD_FCC3 */ - {0x00 },/* 0x31, RT_CHANNEL_DOMAIN_WORLD_FCC4 */ - {0x00 },/* 0x32, RT_CHANNEL_DOMAIN_WORLD_FCC5 */ - {0x00 },/* 0x33, RT_CHANNEL_DOMAIN_WORLD_FCC6 */ - {0x02 },/* 0x34, RT_CHANNEL_DOMAIN_FCC1_FCC7 */ - {0x00 },/* 0x35, RT_CHANNEL_DOMAIN_WORLD_ETSI2 */ - {0x00 },/* 0x36, RT_CHANNEL_DOMAIN_WORLD_ETSI3 */ - {0x03 },/* 0x37, RT_CHANNEL_DOMAIN_MKK1_MKK2 */ - {0x03 },/* 0x38, RT_CHANNEL_DOMAIN_MKK1_MKK3 */ - {0x02 },/* 0x39, RT_CHANNEL_DOMAIN_FCC1_NCC1 */ - {0x00 },/* 0x3A, */ - {0x00 },/* 0x3B, */ - {0x00 },/* 0x3C, */ - {0x00 },/* 0x3D, */ - {0x00 },/* 0x3E, */ - {0x00 },/* 0x3F, */ - {0x02 },/* 0x40, RT_CHANNEL_DOMAIN_FCC1_NCC2 */ - {0x05 },/* 0x41, RT_CHANNEL_DOMAIN_GLOBAL_NULL */ - {0x01 },/* 0x42, RT_CHANNEL_DOMAIN_ETSI1_ETSI4 */ - {0x02 },/* 0x43, RT_CHANNEL_DOMAIN_FCC1_FCC2 */ - {0x02 },/* 0x44, RT_CHANNEL_DOMAIN_FCC1_NCC3 */ - {0x00 },/* 0x45, RT_CHANNEL_DOMAIN_WORLD_ETSI5 */ - {0x02 },/* 0x46, RT_CHANNEL_DOMAIN_FCC1_FCC8 */ - {0x00 },/* 0x47, RT_CHANNEL_DOMAIN_WORLD_ETSI6 */ - {0x00 },/* 0x48, RT_CHANNEL_DOMAIN_WORLD_ETSI7 */ - {0x00 },/* 0x49, RT_CHANNEL_DOMAIN_WORLD_ETSI8 */ - {0x00 },/* 0x50, RT_CHANNEL_DOMAIN_WORLD_ETSI9 */ - {0x00 },/* 0x51, RT_CHANNEL_DOMAIN_WORLD_ETSI10 */ - {0x00 },/* 0x52, RT_CHANNEL_DOMAIN_WORLD_ETSI11 */ - {0x02 },/* 0x53, RT_CHANNEL_DOMAIN_FCC1_NCC4 */ - {0x00 },/* 0x54, RT_CHANNEL_DOMAIN_WORLD_ETSI12 */ - {0x02 },/* 0x55, RT_CHANNEL_DOMAIN_FCC1_FCC9 */ - {0x00 },/* 0x56, RT_CHANNEL_DOMAIN_WORLD_ETSI13 */ - {0x02 },/* 0x57, RT_CHANNEL_DOMAIN_FCC1_FCC10 */ + {0x00 },/* 0x20, RT_CHANNEL_DOMAIN_WORLD_NULL */ + {0x01 },/* 0x21, RT_CHANNEL_DOMAIN_ETSI1_NULL */ + {0x02 },/* 0x22, RT_CHANNEL_DOMAIN_FCC1_NULL */ + {0x03 },/* 0x23, RT_CHANNEL_DOMAIN_MKK1_NULL */ + {0x04 },/* 0x24, RT_CHANNEL_DOMAIN_ETSI2_NULL */ + {0x02 },/* 0x25, RT_CHANNEL_DOMAIN_FCC1_FCC1 */ + {0x00 },/* 0x26, RT_CHANNEL_DOMAIN_WORLD_ETSI1 */ + {0x03 },/* 0x27, RT_CHANNEL_DOMAIN_MKK1_MKK1 */ + {0x00 },/* 0x28, RT_CHANNEL_DOMAIN_WORLD_KCC1 */ + {0x00 },/* 0x29, RT_CHANNEL_DOMAIN_WORLD_FCC2 */ + {0x00 },/* 0x2A, */ + {0x00 },/* 0x2B, */ + {0x00 },/* 0x2C, */ + {0x00 },/* 0x2D, */ + {0x00 },/* 0x2E, */ + {0x00 },/* 0x2F, */ + {0x00 },/* 0x30, RT_CHANNEL_DOMAIN_WORLD_FCC3 */ + {0x00 },/* 0x31, RT_CHANNEL_DOMAIN_WORLD_FCC4 */ + {0x00 },/* 0x32, RT_CHANNEL_DOMAIN_WORLD_FCC5 */ + {0x00 },/* 0x33, RT_CHANNEL_DOMAIN_WORLD_FCC6 */ + {0x02 },/* 0x34, RT_CHANNEL_DOMAIN_FCC1_FCC7 */ + {0x00 },/* 0x35, RT_CHANNEL_DOMAIN_WORLD_ETSI2 */ + {0x00 },/* 0x36, RT_CHANNEL_DOMAIN_WORLD_ETSI3 */ + {0x03 },/* 0x37, RT_CHANNEL_DOMAIN_MKK1_MKK2 */ + {0x03 },/* 0x38, RT_CHANNEL_DOMAIN_MKK1_MKK3 */ + {0x02 },/* 0x39, RT_CHANNEL_DOMAIN_FCC1_NCC1 */ + {0x00 },/* 0x3A, */ + {0x00 },/* 0x3B, */ + {0x00 },/* 0x3C, */ + {0x00 },/* 0x3D, */ + {0x00 },/* 0x3E, */ + {0x00 },/* 0x3F, */ + {0x02 },/* 0x40, RT_CHANNEL_DOMAIN_FCC1_NCC2 */ + {0x05 },/* 0x41, RT_CHANNEL_DOMAIN_GLOBAL_NULL */ + {0x01 },/* 0x42, RT_CHANNEL_DOMAIN_ETSI1_ETSI4 */ + {0x02 },/* 0x43, RT_CHANNEL_DOMAIN_FCC1_FCC2 */ + {0x02 },/* 0x44, RT_CHANNEL_DOMAIN_FCC1_NCC3 */ + {0x00 },/* 0x45, RT_CHANNEL_DOMAIN_WORLD_ETSI5 */ + {0x02 },/* 0x46, RT_CHANNEL_DOMAIN_FCC1_FCC8 */ + {0x00 },/* 0x47, RT_CHANNEL_DOMAIN_WORLD_ETSI6 */ + {0x00 },/* 0x48, RT_CHANNEL_DOMAIN_WORLD_ETSI7 */ + {0x00 },/* 0x49, RT_CHANNEL_DOMAIN_WORLD_ETSI8 */ + {0x00 },/* 0x50, RT_CHANNEL_DOMAIN_WORLD_ETSI9 */ + {0x00 },/* 0x51, RT_CHANNEL_DOMAIN_WORLD_ETSI10 */ + {0x00 },/* 0x52, RT_CHANNEL_DOMAIN_WORLD_ETSI11 */ + {0x02 },/* 0x53, RT_CHANNEL_DOMAIN_FCC1_NCC4 */ + {0x00 },/* 0x54, RT_CHANNEL_DOMAIN_WORLD_ETSI12 */ + {0x02 },/* 0x55, RT_CHANNEL_DOMAIN_FCC1_FCC9 */ + {0x00 },/* 0x56, RT_CHANNEL_DOMAIN_WORLD_ETSI13 */ + {0x02 },/* 0x57, RT_CHANNEL_DOMAIN_FCC1_FCC10 */ }; -/* use the combination for max channel numbers */ -static struct rt_channel_plan_map RTW_CHANNEL_PLAN_MAP_REALTEK_DEFINE = {0x03 }; +/* use the combination for max channel numbers */ +static struct rt_channel_plan_map RTW_CHANNEL_PLAN_MAP_REALTEK_DEFINE = {0x03 };/* Search the @param ch in given @param ch_set * @ch_set: the given channel set
@@ -196,14 +205,25 @@ void init_mlme_default_rate_set(struct adapter *padapter) {struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -unsigned char mixed_datarate[NumRates] = {_1M_RATE_, _2M_RATE_, _5M_RATE_, _11M_RATE_, _6M_RATE_, _9M_RATE_, _12M_RATE_, _18M_RATE_, _24M_RATE_, _36M_RATE_, _48M_RATE_, _54M_RATE_,0xff }; -unsigned char mixed_basicrate[NumRates] = {_1M_RATE_, _2M_RATE_, _5M_RATE_, _11M_RATE_, _6M_RATE_, _12M_RATE_, _24M_RATE_,0xff ,}; -unsigned char supported_mcs_set[16 ] = {0xff ,0xff ,0x00 ,0x00 ,0x01 ,0x0 ,0x0 ,0x0 ,0x0 ,0x0 ,0x0 ,0x0 ,0x0 ,0x0 ,0x0 ,0x0 }; +unsigned char mixed_datarate[NumRates] = { + _1M_RATE_, _2M_RATE_, _5M_RATE_, _11M_RATE_, _6M_RATE_, + _9M_RATE_, _12M_RATE_, _18M_RATE_, _24M_RATE_, _36M_RATE_, + _48M_RATE_, _54M_RATE_,0xff + }; +unsigned char mixed_basicrate[NumRates] = { + _1M_RATE_, _2M_RATE_, _5M_RATE_, _11M_RATE_, + _6M_RATE_, _12M_RATE_, _24M_RATE_,0xff , + }; +unsigned char supported_mcs_set[16 ] = {0xff ,0xff ,0x00 ,0x00 , +0x01 ,0x0 ,0x0 ,0x0 , +0x0 ,0x0 ,0x0 ,0x0 , +0x0 ,0x0 ,0x0 ,0x0 };memcpy (pmlmeext->datarate, mixed_datarate, NumRates);memcpy (pmlmeext->basicrate, mixed_basicrate, NumRates); -memcpy (pmlmeext->default_supported_mcs_set, supported_mcs_set,sizeof (pmlmeext->default_supported_mcs_set)); +memcpy (pmlmeext->default_supported_mcs_set, supported_mcs_set, +sizeof (pmlmeext->default_supported_mcs_set)); }static void init_mlme_ext_priv_value (struct adapter *padapter)
@@ -212,7 +232,8 @@ static void init_mlme_ext_priv_value(struct adapter *padapter)struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;atomic_set (&pmlmeext->event_seq,0 ); - pmlmeext->mgnt_seq =0 ;/* reset to zero when disconnect at client mode */ + pmlmeext->mgnt_seq = +0 ;/* reset to zero when disconnect at client mode */ pmlmeext->sa_query_seq =0 ; pmlmeext->mgnt_80211w_IPN =0 ; pmlmeext->mgnt_80211w_IPN_rx =0 ;
@@ -255,9 +276,8 @@ 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, -u8 chanset_size, -u8 chan) +static int has_channel (struct rt_channel_info *channel_set,u8 chanset_size, +u8 chan) {int i;
@@ -268,20 +288,21 @@ 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, -u8 chanset_size, -struct p2p_channels *channel_list) +static void init_channel_list (struct adapter *padapter, +struct rt_channel_info *channel_set, +u8 chanset_size, +struct p2p_channels *channel_list) {static const struct p2p_oper_class_map op_class[] = { - {IEEE80211G ,81 ,1 ,13 ,1 ,BW20 }, - {IEEE80211G ,82 ,14 ,14 ,1 ,BW20 }, - {IEEE80211A ,115 ,36 ,48 ,4 ,BW20 }, - {IEEE80211A ,116 ,36 ,44 ,8 ,BW40PLUS }, - {IEEE80211A ,117 ,40 ,48 ,8 ,BW40MINUS }, - {IEEE80211A ,124 ,149 ,161 ,4 ,BW20 }, - {IEEE80211A ,125 ,149 ,169 ,4 ,BW20 }, - {IEEE80211A ,126 ,149 ,157 ,8 ,BW40PLUS }, - {IEEE80211A ,127 ,153 ,161 ,8 ,BW40MINUS }, + {IEEE80211G ,81 ,1 ,13 ,1 ,BW20 }, + {IEEE80211G ,82 ,14 ,14 ,1 ,BW20 }, + {IEEE80211A ,115 ,36 ,48 ,4 ,BW20 }, + {IEEE80211A ,116 ,36 ,44 ,8 ,BW40PLUS }, + {IEEE80211A ,117 ,40 ,48 ,8 ,BW40MINUS }, + {IEEE80211A ,124 ,149 ,161 ,4 ,BW20 }, + {IEEE80211A ,125 ,149 ,169 ,4 ,BW20 }, + {IEEE80211A ,126 ,149 ,157 ,8 ,BW40PLUS }, + {IEEE80211A ,127 ,153 ,161 ,8 ,BW40MINUS }, {-1 ,0 ,0 ,0 ,0 ,BW20 } };
@@ -298,11 +319,12 @@ static void init_channel_list(struct adapter *padapter, struct rt_channel_info *if (!has_channel (channel_set, chanset_size, ch))continue ; -if ((padapter->registrypriv.ht_enable ==0 ) && (o->inc ==8 )) +if ((padapter->registrypriv.ht_enable ==0 ) && + (o->inc ==8 ))continue ;if ((0 < (padapter->registrypriv.bw_mode &0xf0 )) && - ((o->bw ==BW40MINUS ) || (o->bw ==BW40PLUS ))) + ((o->bw ==BW40MINUS ) || (o->bw ==BW40PLUS )))continue ;if (!reg) {
@@ -318,15 +340,18 @@ static void init_channel_list(struct adapter *padapter, struct rt_channel_info * channel_list->reg_classes = cla; } -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 b2_4GBand = false;u8 Index2G =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 ) +if (ChannelPlan >=RT_CHANNEL_DOMAIN_MAX && + ChannelPlan !=RT_CHANNEL_DOMAIN_REALTEK_DEFINE )return chanset_size;if (is_supported_24g (padapter->registrypriv.wireless_mode)) {
@@ -338,23 +363,37 @@ static u8 init_channel_set(struct adapter *padapter, u8 ChannelPlan, struct rt_c }if (b2_4GBand) { -for (index =0 ; index < RTW_ChannelPlan2G[Index2G].Len; index++) { - channel_set[chanset_size].ChannelNum = RTW_ChannelPlan2G[Index2G].Channel[index]; - -if ((ChannelPlan ==RT_CHANNEL_DOMAIN_GLOBAL_DOAMIN ) ||/* Channel 1~11 is active, and 12~14 is passive */ - (ChannelPlan ==RT_CHANNEL_DOMAIN_GLOBAL_NULL )) { -if (channel_set[chanset_size].ChannelNum >=1 && channel_set[chanset_size].ChannelNum <=11 ) - channel_set[chanset_size].ScanType =SCAN_ACTIVE ; -else if ((channel_set[chanset_size].ChannelNum >=12 && channel_set[chanset_size].ChannelNum <=14 )) - channel_set[chanset_size].ScanType =SCAN_PASSIVE ; - }else if (ChannelPlan ==RT_CHANNEL_DOMAIN_WORLD_WIDE_13 || - Index2G ==RT_CHANNEL_DOMAIN_2G_WORLD ) {/* channel 12~13, passive scan */ +for (index =0 ; index < RTW_ChannelPlan2G[Index2G].Len; + index++) { + channel_set[chanset_size].ChannelNum = + RTW_ChannelPlan2G[Index2G].Channel[index]; + +if ((ChannelPlan == +RT_CHANNEL_DOMAIN_GLOBAL_DOAMIN ) ||/* Channel 1~11 is active, and 12~14 is passive */ + (ChannelPlan ==RT_CHANNEL_DOMAIN_GLOBAL_NULL )) { +if (channel_set[chanset_size].ChannelNum >=1 && + channel_set[chanset_size].ChannelNum <=11 ) + channel_set[chanset_size].ScanType = +SCAN_ACTIVE ; +else if ((channel_set[chanset_size].ChannelNum >= +12 && + channel_set[chanset_size].ChannelNum <= +14 )) + channel_set[chanset_size].ScanType = +SCAN_PASSIVE ; + }else if (ChannelPlan == +RT_CHANNEL_DOMAIN_WORLD_WIDE_13 || + Index2G == +RT_CHANNEL_DOMAIN_2G_WORLD ) {/* channel 12~13, passive scan */ if (channel_set[chanset_size].ChannelNum <=11 ) - channel_set[chanset_size].ScanType =SCAN_ACTIVE ; + channel_set[chanset_size].ScanType = +SCAN_ACTIVE ;else - channel_set[chanset_size].ScanType =SCAN_PASSIVE ; + channel_set[chanset_size].ScanType = +SCAN_PASSIVE ; }else - channel_set[chanset_size].ScanType =SCAN_ACTIVE ; + channel_set[chanset_size].ScanType = +SCAN_ACTIVE ; chanset_size++; }
@@ -365,7 +404,7 @@ static u8 init_channel_set(struct adapter *padapter, u8 ChannelPlan, struct rt_cstatic void init_mlme_ext_timer (struct adapter *padapter) { -struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; +struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;timer_setup (&pmlmeext->survey_timer, survey_timer_hdl,0 );timer_setup (&pmlmeext->link_timer, link_timer_hdl,0 );
@@ -390,8 +429,10 @@ void init_mlme_ext_priv(struct adapter *padapter)init_mlme_ap_info (padapter); - pmlmeext->max_chan_nums =init_channel_set (padapter, pmlmepriv->ChannelPlan, pmlmeext->channel_set); -init_channel_list (padapter, pmlmeext->channel_set, pmlmeext->max_chan_nums, &pmlmeext->channel_list); + pmlmeext->max_chan_nums =init_channel_set ( + padapter, pmlmepriv->ChannelPlan, pmlmeext->channel_set); +init_channel_list (padapter, pmlmeext->channel_set, + pmlmeext->max_chan_nums, &pmlmeext->channel_list); pmlmeext->last_scan_time =0 ; pmlmeext->chan_scan_time =SURVEY_TO ; pmlmeext->mlmeext_init = true;
@@ -412,13 +453,16 @@ void free_mlme_ext_priv(struct mlme_ext_priv *pmlmeext) } } -static void _mgt_dispatcher (struct adapter *padapter,struct mlme_handler *ptable,union recv_frame *precv_frame) +static void _mgt_dispatcher (struct adapter *padapter, +struct mlme_handler *ptable, +union recv_frame *precv_frame) {u8 *pframe = precv_frame->u.hdr.rx_data;if (ptable->func) {/* receive the frames that ra(a1) is my address or ra(a1) is bc address. */ -if (memcmp (GetAddr1Ptr (pframe),myid (&padapter->eeprompriv),ETH_ALEN ) && +if (memcmp (GetAddr1Ptr (pframe),myid (&padapter->eeprompriv), +ETH_ALEN ) && !is_broadcast_ether_addr (GetAddr1Ptr (pframe)))return ;
@@ -432,13 +476,15 @@ void mgt_dispatcher(struct adapter *padapter, union recv_frame *precv_frame)struct mlme_handler *ptable;struct mlme_priv *pmlmepriv = &padapter->mlmepriv;u8 *pframe = precv_frame->u.hdr.rx_data; -struct sta_info *psta =rtw_get_stainfo (&padapter->stapriv,GetAddr2Ptr (pframe)); +struct sta_info *psta = +rtw_get_stainfo (&padapter->stapriv,GetAddr2Ptr (pframe));if (GetFrameType (pframe) !=WIFI_MGT_TYPE )return ;/* receive the frames that ra(a1) is my address or ra(a1) is bc address. */ -if (memcmp (GetAddr1Ptr (pframe),myid (&padapter->eeprompriv),ETH_ALEN ) && +if (memcmp (GetAddr1Ptr (pframe),myid (&padapter->eeprompriv), +ETH_ALEN ) && !is_broadcast_ether_addr (GetAddr1Ptr (pframe))) {return ; }
@@ -454,7 +500,8 @@ void mgt_dispatcher(struct adapter *padapter, union recv_frame *precv_frame)if (psta) {if (GetRetry (pframe)) { -if (precv_frame->u.hdr.attrib.seq_num == psta->RxMgmtFrameSeqNum) { +if (precv_frame->u.hdr.attrib.seq_num == + psta->RxMgmtFrameSeqNum) {/* drop the duplicate management frame */ return ; }
@@ -493,12 +540,12 @@ void mgt_dispatcher(struct adapter *padapter, union recv_frame *precv_frame)unsigned int OnProbeReq (struct adapter *padapter,union recv_frame *precv_frame) { -unsigned int ielen; +unsigned int ielen;unsigned char *p;struct mlme_priv *pmlmepriv = &padapter->mlmepriv;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info; -struct wlan_bssid_ex *cur = &pmlmeinfo->network; +struct wlan_bssid_ex *cur = &pmlmeinfo->network;u8 *pframe = precv_frame->u.hdr.rx_data;uint len = precv_frame->u.hdr.len;u8 is_valid_p2p_probereq = false;
@@ -507,28 +554,31 @@ unsigned int OnProbeReq(struct adapter *padapter, union recv_frame *precv_frame)return _SUCCESS;if (!check_fwstate (pmlmepriv, _FW_LINKED) && - !check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE |WIFI_AP_STATE )) { + !check_fwstate (pmlmepriv, +WIFI_ADHOC_MASTER_STATE |WIFI_AP_STATE )) {return _SUCCESS; } - p =rtw_get_ie (pframe +WLAN_HDR_A3_LEN + _PROBEREQ_IE_OFFSET_,WLAN_EID_SSID , (int *)&ielen, - len -WLAN_HDR_A3_LEN - _PROBEREQ_IE_OFFSET_); + p =rtw_get_ie (pframe +WLAN_HDR_A3_LEN + _PROBEREQ_IE_OFFSET_, +WLAN_EID_SSID , (int *)&ielen, + len -WLAN_HDR_A3_LEN - _PROBEREQ_IE_OFFSET_);/* check (wildcard) SSID */ if (p) {if (is_valid_p2p_probereq) goto _issue_probersp; -if ((ielen !=0 && false == !memcmp ((p+2 ), cur->ssid.ssid, cur->ssid.ssid_length)) - || (ielen ==0 && pmlmeinfo->hidden_ssid_mode) - ) +if ((ielen !=0 && false == !memcmp ((p +2 ), cur->ssid.ssid, + cur->ssid.ssid_length)) || + (ielen ==0 && pmlmeinfo->hidden_ssid_mode))return _SUCCESS; _issue_probersp:if ((check_fwstate (pmlmepriv, _FW_LINKED) && pmlmepriv->cur_network.join_res) ||check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE )) -issue_probersp (padapter,get_sa (pframe), is_valid_p2p_probereq); +issue_probersp (padapter,get_sa (pframe), + is_valid_p2p_probereq); }return _SUCCESS;
@@ -561,10 +611,16 @@ unsigned int OnBeacon(struct adapter *padapter, union recv_frame *precv_frame)u8 *p =NULL ;u32 ielen =0 ; - p =rtw_get_ie (pframe +sizeof (struct ieee80211_hdr_3addr ) + _BEACON_IE_OFFSET_,WLAN_EID_EXT_SUPP_RATES , &ielen, precv_frame->u.hdr.len -sizeof (struct ieee80211_hdr_3addr ) - _BEACON_IE_OFFSET_); + p =rtw_get_ie (pframe +sizeof (struct ieee80211_hdr_3addr ) + + _BEACON_IE_OFFSET_, +WLAN_EID_EXT_SUPP_RATES , &ielen, + precv_frame->u.hdr.len - +sizeof (struct ieee80211_hdr_3addr ) - + _BEACON_IE_OFFSET_);if (p && ielen >0 ) {if (p +2 + ielen < pframe + len) { -if ((*(p +1 + ielen) ==0x2D ) && (*(p +2 + ielen) !=0x2D )) +if ((*(p +1 + ielen) ==0x2D ) && + (*(p +2 + ielen) !=0x2D ))/* Invalid value 0x2D is detected in Extended Supported Rates (ESR) IE. Try to fix the IE length to avoid failed Beacon parsing. */ *(p +1 ) = ielen -1 ; }
@@ -575,20 +631,27 @@ unsigned int OnBeacon(struct adapter *padapter, union recv_frame *precv_frame)return _SUCCESS; } -if (!memcmp (GetAddr3Ptr (pframe),get_my_bssid (&pmlmeinfo->network),ETH_ALEN )) { +if (!memcmp (GetAddr3Ptr (pframe),get_my_bssid (&pmlmeinfo->network), +ETH_ALEN )) {if (pmlmeinfo->state &WIFI_FW_AUTH_NULL ) {/* we should update current network before auth, or some IE is wrong */ pbss =kmalloc_obj (*pbss,GFP_ATOMIC );if (pbss) { -if (collect_bss_info (padapter, precv_frame, pbss) == _SUCCESS) { -update_network (&(pmlmepriv->cur_network.network), pbss, padapter, true); -rtw_get_bcn_info (&(pmlmepriv->cur_network)); +if (collect_bss_info (padapter, precv_frame, + pbss) == _SUCCESS) { +update_network (&(pmlmepriv->cur_network + .network), + pbss, padapter, true); +rtw_get_bcn_info ( + &(pmlmepriv->cur_network)); }kfree (pbss); }/* check the vendor of the assoc AP */ - pmlmeinfo->assoc_AP_vendor =check_assoc_AP (pframe+sizeof (struct ieee80211_hdr_3addr ), len-sizeof (struct ieee80211_hdr_3addr )); + pmlmeinfo->assoc_AP_vendor =check_assoc_AP ( + pframe +sizeof (struct ieee80211_hdr_3addr ), + len -sizeof (struct ieee80211_hdr_3addr ));/* update TSF Value */ update_TSF (pmlmeext, pframe, len);
@@ -598,8 +661,10 @@ unsigned int OnBeacon(struct adapter *padapter, union recv_frame *precv_frame) pmlmeext->DrvBcnEarly =0xff ; pmlmeext->DrvBcnTimeOut =0xff ; pmlmeext->bcn_cnt =0 ; -memset (pmlmeext->bcn_delay_cnt,0 ,sizeof (pmlmeext->bcn_delay_cnt)); -memset (pmlmeext->bcn_delay_ratio,0 ,sizeof (pmlmeext->bcn_delay_ratio)); +memset (pmlmeext->bcn_delay_cnt,0 , +sizeof (pmlmeext->bcn_delay_cnt)); +memset (pmlmeext->bcn_delay_ratio,0 , +sizeof (pmlmeext->bcn_delay_ratio));/* start auth */ start_clnt_auth (padapter);
@@ -607,31 +672,37 @@ unsigned int OnBeacon(struct adapter *padapter, union recv_frame *precv_frame)return _SUCCESS; } -if (((pmlmeinfo->state&0x03 ) ==WIFI_FW_STATION_STATE ) && (pmlmeinfo->state &WIFI_FW_ASSOC_SUCCESS )) { +if (((pmlmeinfo->state &0x03 ) ==WIFI_FW_STATION_STATE ) && + (pmlmeinfo->state &WIFI_FW_ASSOC_SUCCESS )) { psta =rtw_get_stainfo (pstapriv,GetAddr2Ptr (pframe));if (psta) { ret =rtw_check_bcn_info (padapter, pframe, len);if (!ret) { -netdev_dbg (padapter->pnetdev, -"ap has changed, disconnect now\n" ); -receive_disconnect (padapter, - pmlmeinfo->network.mac_address,0 ); +netdev_dbg ( + padapter->pnetdev, +"ap has changed, disconnect now\n" ); +receive_disconnect ( + padapter, + pmlmeinfo->network.mac_address, +0 );return _SUCCESS; }/* update WMM, ERP in the beacon */ /* todo: the timer is used instead of the number of the beacon received */ if ((sta_rx_pkts (psta) &0xf ) ==0 ) -update_beacon_info (padapter, pframe, len, psta); +update_beacon_info (padapter, pframe, + len, psta);adaptive_early_32k (pmlmeext, pframe, len); } - }else if ((pmlmeinfo->state&0x03 ) ==WIFI_FW_ADHOC_STATE ) { + }else if ((pmlmeinfo->state &0x03 ) ==WIFI_FW_ADHOC_STATE ) { psta =rtw_get_stainfo (pstapriv,GetAddr2Ptr (pframe));if (psta) {/* update WMM, ERP in the beacon */ /* todo: the timer is used instead of the number of the beacon received */ if ((sta_rx_pkts (psta) &0xf ) ==0 ) -update_beacon_info (padapter, pframe, len, psta); +update_beacon_info (padapter, pframe, + len, psta); }else {/* allocate a new CAM entry for IBSS station */ cam_idx =allocate_fw_sta_entry (padapter);
@@ -639,8 +710,15 @@ unsigned int OnBeacon(struct adapter *padapter, union recv_frame *precv_frame) goto _END_ONBEACON_;/* get supported rate */ -if (update_sta_support_rate (padapter, (pframe +WLAN_HDR_A3_LEN + _BEACON_IE_OFFSET_), (len -WLAN_HDR_A3_LEN - _BEACON_IE_OFFSET_), cam_idx) == _FAIL) { - pmlmeinfo->FW_sta_info[cam_idx].status =0 ; +if (update_sta_support_rate ( + padapter, + (pframe +WLAN_HDR_A3_LEN + + _BEACON_IE_OFFSET_), + (len -WLAN_HDR_A3_LEN - + _BEACON_IE_OFFSET_), + cam_idx) == _FAIL) { + pmlmeinfo->FW_sta_info[cam_idx].status = +0 ; goto _END_ONBEACON_; }
@@ -648,7 +726,8 @@ unsigned int OnBeacon(struct adapter *padapter, union recv_frame *precv_frame)update_TSF (pmlmeext, pframe, len);/* report sta add event */ -report_add_sta_event (padapter,GetAddr2Ptr (pframe), cam_idx); +report_add_sta_event ( + padapter,GetAddr2Ptr (pframe), cam_idx); } } }
@@ -660,13 +739,13 @@ unsigned int OnBeacon(struct adapter *padapter, union recv_frame *precv_frame)unsigned int OnAuth (struct adapter *padapter,union recv_frame *precv_frame) { -unsigned int auth_mode, seq, ie_len; +unsigned int auth_mode, seq, ie_len;unsigned char *sa, *p;u16 algorithm; -int status; +int status;static struct sta_info stat; -struct sta_info *pstat =NULL ; -struct sta_priv *pstapriv = &padapter->stapriv; +struct sta_info *pstat =NULL ; +struct sta_priv *pstapriv = &padapter->stapriv;struct security_priv *psecuritypriv = &padapter->securitypriv;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;
@@ -674,7 +753,7 @@ unsigned int OnAuth(struct adapter *padapter, union recv_frame *precv_frame)uint len = precv_frame->u.hdr.len;u8 offset =0 ; -if ((pmlmeinfo->state&0x03 ) !=WIFI_FW_AP_STATE ) +if ((pmlmeinfo->state &0x03 ) !=WIFI_FW_AP_STATE )return _FAIL; sa =GetAddr2Ptr (pframe);
@@ -683,13 +762,13 @@ unsigned int OnAuth(struct adapter *padapter, union recv_frame *precv_frame)if (GetPrivacy (pframe)) {u8 *iv; -struct rx_pkt_attrib *prxattrib = &(precv_frame->u.hdr.attrib); +struct rx_pkt_attrib *prxattrib = &(precv_frame->u.hdr.attrib); prxattrib->hdrlen =WLAN_HDR_A3_LEN ; prxattrib->encrypt = _WEP40_; - iv = pframe+prxattrib->hdrlen; - prxattrib->key_index = ((iv[3 ]>>6 )&0x3 ); + iv = pframe + prxattrib->hdrlen; + prxattrib->key_index = ((iv[3 ] >>6 ) &0x3 ); prxattrib->iv_len =4 ; prxattrib->icv_len =4 ;
@@ -699,16 +778,21 @@ unsigned int OnAuth(struct adapter *padapter, union recv_frame *precv_frame) offset =4 ; } - algorithm =le16_to_cpu (*(__le16 *)((SIZE_PTR )pframe +WLAN_HDR_A3_LEN + offset)); - seq =le16_to_cpu (*(__le16 *)((SIZE_PTR )pframe +WLAN_HDR_A3_LEN + offset +2 )); + algorithm =le16_to_cpu ( + *(__le16 *)((SIZE_PTR )pframe +WLAN_HDR_A3_LEN + offset)); + seq =le16_to_cpu ( + *(__le16 *)((SIZE_PTR )pframe +WLAN_HDR_A3_LEN + offset +2 )); -if (auth_mode ==2 && - psecuritypriv->dot11PrivacyAlgrthm != _WEP40_ && - psecuritypriv->dot11PrivacyAlgrthm != _WEP104_) +if (auth_mode ==2 && psecuritypriv->dot11PrivacyAlgrthm != _WEP40_ && + psecuritypriv->dot11PrivacyAlgrthm != _WEP104_) auth_mode =0 ; -if ((algorithm >0 && auth_mode ==0 ) ||/* rx a shared-key auth but shared not enabled */ - (algorithm ==0 && auth_mode ==1 )) {/* rx a open-system auth but shared-key is enabled */ +if ((algorithm >0 && + auth_mode == +0 ) ||/* rx a shared-key auth but shared not enabled */ + (algorithm ==0 && + auth_mode == +1 )) {/* rx a open-system auth but shared-key is enabled */ status =WLAN_STATUS_NOT_SUPPORTED_AUTH_ALG ;
@@ -765,7 +849,8 @@ unsigned int OnAuth(struct adapter *padapter, union recv_frame *precv_frame) goto auth_fail; } -if (algorithm ==0 && (auth_mode ==0 || auth_mode ==2 || auth_mode ==3 )) { +if (algorithm ==0 && + (auth_mode ==0 || auth_mode ==2 || auth_mode ==3 )) {if (seq ==1 ) { pstat->state &= ~WIFI_FW_AUTH_NULL ; pstat->state |=WIFI_FW_AUTH_SUCCESS ;
@@ -784,8 +869,10 @@ unsigned int OnAuth(struct adapter *padapter, union recv_frame *precv_frame) pstat->state |=WIFI_FW_AUTH_STATE ; pstat->authalg = algorithm; }else if (seq ==3 ) { - p =rtw_get_ie (pframe +WLAN_HDR_A3_LEN +4 + _AUTH_IE_OFFSET_,WLAN_EID_CHALLENGE , (int *)&ie_len, - len -WLAN_HDR_A3_LEN - _AUTH_IE_OFFSET_ -4 ); + p =rtw_get_ie ( + pframe +WLAN_HDR_A3_LEN +4 + _AUTH_IE_OFFSET_, +WLAN_EID_CHALLENGE , (int *)&ie_len, + len -WLAN_HDR_A3_LEN - _AUTH_IE_OFFSET_ -4 );if (!p || ie_len <=0 ) { status =WLAN_STATUS_CHALLENGE_FAIL ;
@@ -796,7 +883,7 @@ unsigned int OnAuth(struct adapter *padapter, union recv_frame *precv_frame) pstat->state &= (~WIFI_FW_AUTH_STATE ); pstat->state |=WIFI_FW_AUTH_SUCCESS ;/* challenging txt is correct... */ - pstat->expire_to = pstapriv->assoc_to; + pstat->expire_to = pstapriv->assoc_to; }else { status =WLAN_STATUS_CHALLENGE_FAIL ; goto auth_fail;
@@ -832,11 +919,12 @@ unsigned int OnAuth(struct adapter *padapter, union recv_frame *precv_frame)return _FAIL; } -unsigned int OnAuthClient (struct adapter *padapter,union recv_frame *precv_frame) +unsigned int OnAuthClient (struct adapter *padapter, +union recv_frame *precv_frame) { -unsigned int seq, len, status, offset; +unsigned int seq, len, status, offset;unsigned char *p; -unsigned int go2asoc =0 ; +unsigned int go2asoc =0 ;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;u8 *pframe = precv_frame->u.hdr.rx_data;
@@ -851,11 +939,14 @@ unsigned int OnAuthClient(struct adapter *padapter, union recv_frame *precv_fram offset = (GetPrivacy (pframe)) ?4 :0 ; - seq =le16_to_cpu (*(__le16 *)((SIZE_PTR )pframe +WLAN_HDR_A3_LEN + offset +2 )); - status =le16_to_cpu (*(__le16 *)((SIZE_PTR )pframe +WLAN_HDR_A3_LEN + offset +4 )); + seq =le16_to_cpu ( + *(__le16 *)((SIZE_PTR )pframe +WLAN_HDR_A3_LEN + offset +2 )); + status =le16_to_cpu ( + *(__le16 *)((SIZE_PTR )pframe +WLAN_HDR_A3_LEN + offset +4 ));if (status !=0 ) { -if (status ==13 ) {/* pmlmeinfo->auth_algo == dot11AuthAlgrthm_Auto) */ +if (status == +13 ) {/* pmlmeinfo->auth_algo == dot11AuthAlgrthm_Auto) */ if (pmlmeinfo->auth_algo == dot11AuthAlgrthm_Shared) pmlmeinfo->auth_algo = dot11AuthAlgrthm_Open;else
@@ -869,8 +960,10 @@ unsigned int OnAuthClient(struct adapter *padapter, union recv_frame *precv_framif (seq ==2 ) {if (pmlmeinfo->auth_algo == dot11AuthAlgrthm_Shared) { -/* legendary shared system */ - p =rtw_get_ie (pframe +WLAN_HDR_A3_LEN + _AUTH_IE_OFFSET_,WLAN_EID_CHALLENGE , (int *)&len, +/* legendary shared system */ + p =rtw_get_ie ( + pframe +WLAN_HDR_A3_LEN + _AUTH_IE_OFFSET_, +WLAN_EID_CHALLENGE , (int *)&len, pkt_len -WLAN_HDR_A3_LEN - _AUTH_IE_OFFSET_);if (!p)
@@ -914,23 +1007,23 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame)struct rtw_ieee802_11_elems elems;struct sta_info *pstat;unsigned char *p, *pos, *wpa_ie; -unsigned char WMM_IE [] = {0x00 ,0x50 ,0xf2 ,0x02 ,0x00 ,0x01 }; -int i, ie_len, left; +unsigned char WMM_IE [] = {0x00 ,0x50 ,0xf2 ,0x02 ,0x00 ,0x01 }; +int i, ie_len, left;u8 wpa_ie_len;unsigned char supportRate[16 ]; -int support_rate_num; -unsigned short status =WLAN_STATUS_SUCCESS ; -unsigned short frame_type, ie_offset =0 ; +int support_rate_num; +unsigned short status =WLAN_STATUS_SUCCESS ; +unsigned short frame_type, ie_offset =0 ;struct mlme_priv *pmlmepriv = &padapter->mlmepriv;struct security_priv *psecuritypriv = &padapter->securitypriv;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info; -struct wlan_bssid_ex *cur = &(pmlmeinfo->network); +struct wlan_bssid_ex *cur = &(pmlmeinfo->network);struct sta_priv *pstapriv = &padapter->stapriv;u8 *pframe = precv_frame->u.hdr.rx_data;uint pkt_len = precv_frame->u.hdr.len; -if ((pmlmeinfo->state&0x03 ) !=WIFI_FW_AP_STATE ) +if ((pmlmeinfo->state &0x03 ) !=WIFI_FW_AP_STATE )return _FAIL; frame_type =GetFrameSubType (pframe);
@@ -979,8 +1072,8 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame)/* now we should check all the fields... */ /* checking SSID */ - p =rtw_get_ie (pframe +WLAN_HDR_A3_LEN + ie_offset,WLAN_EID_SSID , &ie_len, - pkt_len -WLAN_HDR_A3_LEN - ie_offset); + p =rtw_get_ie (pframe +WLAN_HDR_A3_LEN + ie_offset,WLAN_EID_SSID , + &ie_len, pkt_len -WLAN_HDR_A3_LEN - ie_offset);if (!p || ie_len ==0 ) {/* broadcast ssid, however it is not allowed in assocreq */
@@ -988,7 +1081,7 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame) goto OnAssocReqFail; }else {/* check if ssid match */ -if (memcmp (p+2 , cur->ssid.ssid, cur->ssid.ssid_length)) +if (memcmp (p +2 , cur->ssid.ssid, cur->ssid.ssid_length)) status =WLAN_STATUS_CHALLENGE_FAIL ;if (ie_len != cur->ssid.ssid_length)
@@ -999,7 +1092,9 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame) goto OnAssocReqFail;/* check if the supported rate is ok */ - p =rtw_get_ie (pframe +WLAN_HDR_A3_LEN + ie_offset,WLAN_EID_SUPP_RATES , &ie_len, pkt_len -WLAN_HDR_A3_LEN - ie_offset); + p =rtw_get_ie (pframe +WLAN_HDR_A3_LEN + ie_offset, +WLAN_EID_SUPP_RATES , &ie_len, + pkt_len -WLAN_HDR_A3_LEN - ie_offset);if (!p) {/* use our own rate set as statoin used */ /* memcpy(supportRate, AP_BSSRATE, AP_BSSRATE_LEN); */
@@ -1011,14 +1106,16 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame)if (ie_len >sizeof (supportRate)) ie_len =sizeof (supportRate); -memcpy (supportRate, p+2 , ie_len); +memcpy (supportRate, p +2 , ie_len); support_rate_num = ie_len; - p =rtw_get_ie (pframe +WLAN_HDR_A3_LEN + ie_offset,WLAN_EID_EXT_SUPP_RATES , &ie_len, - pkt_len -WLAN_HDR_A3_LEN - ie_offset); + p =rtw_get_ie (pframe +WLAN_HDR_A3_LEN + ie_offset, +WLAN_EID_EXT_SUPP_RATES , &ie_len, + pkt_len -WLAN_HDR_A3_LEN - ie_offset);if (p) {if (support_rate_num + ie_len <=sizeof (supportRate)) { -memcpy (supportRate + support_rate_num, p +2 , ie_len); +memcpy (supportRate + support_rate_num, p +2 , + ie_len); support_rate_num += ie_len; } }
@@ -1046,12 +1143,16 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame) wpa_ie = elems.rsn_ie; wpa_ie_len = elems.rsn_ie_len; -if (rtw_parse_wpa2_ie (wpa_ie-2 , wpa_ie_len+2 , &group_cipher, &pairwise_cipher,NULL ) == _SUCCESS) { - pstat->dot8021xalg =1 ;/* psk, todo:802.1x */ +if (rtw_parse_wpa2_ie (wpa_ie -2 , wpa_ie_len +2 , &group_cipher, + &pairwise_cipher,NULL ) == _SUCCESS) { + pstat->dot8021xalg =1 ;/* psk, todo:802.1x */ pstat->wpa_psk |=BIT (1 ); - pstat->wpa2_group_cipher = group_cipher&psecuritypriv->wpa2_group_cipher; - pstat->wpa2_pairwise_cipher = pairwise_cipher&psecuritypriv->wpa2_pairwise_cipher; + pstat->wpa2_group_cipher = + group_cipher & psecuritypriv->wpa2_group_cipher; + pstat->wpa2_pairwise_cipher = + pairwise_cipher & + psecuritypriv->wpa2_pairwise_cipher;if (!pstat->wpa2_group_cipher) status =WLAN_STATUS_INVALID_GROUP_CIPHER ;
@@ -1068,12 +1169,16 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame) wpa_ie = elems.wpa_ie; wpa_ie_len = elems.wpa_ie_len; -if (rtw_parse_wpa_ie (wpa_ie-2 , wpa_ie_len+2 , &group_cipher, &pairwise_cipher,NULL ) == _SUCCESS) { - pstat->dot8021xalg =1 ;/* psk, todo:802.1x */ +if (rtw_parse_wpa_ie (wpa_ie -2 , wpa_ie_len +2 , &group_cipher, + &pairwise_cipher,NULL ) == _SUCCESS) { + pstat->dot8021xalg =1 ;/* psk, todo:802.1x */ pstat->wpa_psk |=BIT (0 ); - pstat->wpa_group_cipher = group_cipher&psecuritypriv->wpa_group_cipher; - pstat->wpa_pairwise_cipher = pairwise_cipher&psecuritypriv->wpa_pairwise_cipher; + pstat->wpa_group_cipher = + group_cipher & psecuritypriv->wpa_group_cipher; + pstat->wpa_pairwise_cipher = + pairwise_cipher & + psecuritypriv->wpa_pairwise_cipher;if (!pstat->wpa_group_cipher) status =WLAN_STATUS_INVALID_GROUP_CIPHER ;
@@ -1102,15 +1207,20 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame)/* AP support WPA/RSN, and sta is going to do WPS, but AP is not ready */ /* that the selected registrar of AP is _FLASE */ -if ((psecuritypriv->wpa_psk >0 ) - && (pstat->flags & (WLAN_STA_WPS |WLAN_STA_MAYBE_WPS ))) { +if ((psecuritypriv->wpa_psk >0 ) && + (pstat->flags & (WLAN_STA_WPS |WLAN_STA_MAYBE_WPS ))) {if (pmlmepriv->wps_beacon_ie) {u8 selected_registrar =0 ; -rtw_get_wps_attr_content (pmlmepriv->wps_beacon_ie, pmlmepriv->wps_beacon_ie_len,WPS_ATTR_SELECTED_REGISTRAR , &selected_registrar,NULL ); +rtw_get_wps_attr_content ( + pmlmepriv->wps_beacon_ie, + pmlmepriv->wps_beacon_ie_len, +WPS_ATTR_SELECTED_REGISTRAR , + &selected_registrar,NULL );if (!selected_registrar) { - status =WLAN_STATUS_AP_UNABLE_TO_HANDLE_NEW_STA ; + status = +WLAN_STATUS_AP_UNABLE_TO_HANDLE_NEW_STA ; goto OnAssocReqFail; }
@@ -1134,7 +1244,7 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame) }if (copy_len >0 ) -memcpy (pstat->wpa_ie, wpa_ie-2 , copy_len); +memcpy (pstat->wpa_ie, wpa_ie -2 , copy_len); }/* check if there is WMM IE & support WWM-PS */
@@ -1147,13 +1257,15 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame) pstat->uapsd_be =0 ; pstat->uapsd_bk =0 ;if (pmlmepriv->qospriv.qos_option) { - p = pframe +WLAN_HDR_A3_LEN + ie_offset; ie_len =0 ; + p = pframe +WLAN_HDR_A3_LEN + ie_offset; + ie_len =0 ;for (;;) { - p =rtw_get_ie (p,WLAN_EID_VENDOR_SPECIFIC , &ie_len, pkt_len -WLAN_HDR_A3_LEN - ie_offset); + p =rtw_get_ie (p,WLAN_EID_VENDOR_SPECIFIC , &ie_len, + pkt_len -WLAN_HDR_A3_LEN - ie_offset);if (!p)break ; -if (memcmp (p+2 ,WMM_IE ,6 )) { +if (memcmp (p +2 ,WMM_IE ,6 )) { p = p + ie_len +2 ;continue ; }
@@ -1161,33 +1273,33 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame) pstat->flags |=WLAN_STA_WME ; pstat->qos_option =1 ; - pstat->qos_info = *(p+8 ); + pstat->qos_info = *(p +8 ); - pstat->max_sp_len = (pstat->qos_info>>5 )&0x3 ; + pstat->max_sp_len = (pstat->qos_info >>5 ) &0x3 ; -if ((pstat->qos_info&0xf ) !=0xf ) +if ((pstat->qos_info &0xf ) !=0xf ) pstat->has_legacy_ac = true;else pstat->has_legacy_ac = false; -if (pstat->qos_info&0xf ) { -if (pstat->qos_info&BIT (0 )) - pstat->uapsd_vo =BIT (0 )|BIT (1 ); +if (pstat->qos_info &0xf ) { +if (pstat->qos_info &BIT (0 )) + pstat->uapsd_vo =BIT (0 ) |BIT (1 );else pstat->uapsd_vo =0 ; -if (pstat->qos_info&BIT (1 )) - pstat->uapsd_vi =BIT (0 )|BIT (1 ); +if (pstat->qos_info &BIT (1 )) + pstat->uapsd_vi =BIT (0 ) |BIT (1 );else pstat->uapsd_vi =0 ; -if (pstat->qos_info&BIT (2 )) - pstat->uapsd_bk =BIT (0 )|BIT (1 ); +if (pstat->qos_info &BIT (2 )) + pstat->uapsd_bk =BIT (0 ) |BIT (1 );else pstat->uapsd_bk =0 ; -if (pstat->qos_info&BIT (3 )) - pstat->uapsd_be =BIT (0 )|BIT (1 ); +if (pstat->qos_info &BIT (3 )) + pstat->uapsd_be =BIT (0 ) |BIT (1 );else pstat->uapsd_be =0 ; }
@@ -1198,24 +1310,26 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame)/* save HT capabilities in the sta object */ memset (&pstat->htpriv.ht_cap,0 ,sizeof (struct ieee80211_ht_cap )); -if (elems.ht_capabilities && elems.ht_capabilities_len >=sizeof (struct ieee80211_ht_cap )) { +if (elems.ht_capabilities && + elems.ht_capabilities_len >=sizeof (struct ieee80211_ht_cap )) { pstat->flags |=WLAN_STA_HT ; pstat->flags |=WLAN_STA_WME ; -memcpy (&pstat->htpriv.ht_cap, elems.ht_capabilities,sizeof (struct ieee80211_ht_cap )); +memcpy (&pstat->htpriv.ht_cap, elems.ht_capabilities, +sizeof (struct ieee80211_ht_cap )); }else pstat->flags &= ~WLAN_STA_HT ; -if (!pmlmepriv->htpriv.ht_option && (pstat->flags&WLAN_STA_HT )) { +if (!pmlmepriv->htpriv.ht_option && (pstat->flags &WLAN_STA_HT )) { status =WLAN_STATUS_CHALLENGE_FAIL ; goto OnAssocReqFail; }if ((pstat->flags &WLAN_STA_HT ) && - ((pstat->wpa2_pairwise_cipher&WPA_CIPHER_TKIP ) || - (pstat->wpa_pairwise_cipher&WPA_CIPHER_TKIP ))) { + ((pstat->wpa2_pairwise_cipher &WPA_CIPHER_TKIP ) || + (pstat->wpa_pairwise_cipher &WPA_CIPHER_TKIP ))) {/* status = WLAN_STATUS_CIPHER_SUITE_REJECTED; */ /* goto OnAssocReqFail; */ }
@@ -1276,7 +1390,8 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame)spin_unlock_bh (&pstapriv->asoc_list_lock);/* now the station is qualified to join our BSS... */ -if (pstat && (pstat->state &WIFI_FW_ASSOC_SUCCESS ) && (status ==WLAN_STATUS_SUCCESS )) { +if (pstat && (pstat->state &WIFI_FW_ASSOC_SUCCESS ) && + (status ==WLAN_STATUS_SUCCESS )) {/* 1 bss_cap_update & sta_info_update */ bss_cap_update_on_sta_join (padapter, pstat);sta_info_update (padapter, pstat);
@@ -1323,7 +1438,7 @@ unsigned int OnAssocRsp(struct adapter *padapter, union recv_frame *precv_frame) {uint i;int res; -unsigned short status; +unsigned short status;struct ndis_80211_var_ie *pIE;struct mlme_priv *pmlmepriv = &padapter->mlmepriv;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
@@ -1353,13 +1468,16 @@ unsigned int OnAssocRsp(struct adapter *padapter, union recv_frame *precv_frame) }/* get capabilities */ - pmlmeinfo->capability =le16_to_cpu (*(__le16 *)(pframe +WLAN_HDR_A3_LEN )); + pmlmeinfo->capability = +le16_to_cpu (*(__le16 *)(pframe +WLAN_HDR_A3_LEN ));/* set slot time */ pmlmeinfo->slotTime = (pmlmeinfo->capability &BIT (10 )) ?9 :20 ;/* AID */ - res = pmlmeinfo->aid = (int )(le16_to_cpu (*(__le16 *)(pframe +WLAN_HDR_A3_LEN +4 ))&0x3fff ); + res = pmlmeinfo->aid = + (int )(le16_to_cpu (*(__le16 *)(pframe +WLAN_HDR_A3_LEN +4 )) & +0x3fff );/* following are moved to join event callback function */ /* to handle HT, WMM, rate adaptive, update MAC reg */
@@ -1369,15 +1487,15 @@ unsigned int OnAssocRsp(struct adapter *padapter, union recv_frame *precv_frame)switch (pIE->element_id) {case WLAN_EID_VENDOR_SPECIFIC : -if (!memcmp (pIE->data,WMM_PARA_OUI ,6 ))/* WMM */ +if (!memcmp (pIE->data,WMM_PARA_OUI ,6 ))/* WMM */ WMM_param_handler (padapter, pIE);break ; -case WLAN_EID_HT_CAPABILITY :/* HT caps */ +case WLAN_EID_HT_CAPABILITY :/* HT caps */ HT_caps_handler (padapter, pIE);break ; -case WLAN_EID_HT_OPERATION :/* HT info */ +case WLAN_EID_HT_OPERATION :/* HT info */ HT_info_handler (padapter, pIE);break ;
@@ -1400,7 +1518,8 @@ unsigned int OnAssocRsp(struct adapter *padapter, union recv_frame *precv_frame) report_assoc_result:if (res >0 ) -rtw_buf_update (&pmlmepriv->assoc_rsp, &pmlmepriv->assoc_rsp_len, pframe, pkt_len); +rtw_buf_update (&pmlmepriv->assoc_rsp, &pmlmepriv->assoc_rsp_len, + pframe, pkt_len);else rtw_buf_free (&pmlmepriv->assoc_rsp, &pmlmepriv->assoc_rsp_len);
@@ -1411,7 +1530,7 @@ unsigned int OnAssocRsp(struct adapter *padapter, union recv_frame *precv_frame)unsigned int OnDeAuth (struct adapter *padapter,union recv_frame *precv_frame) { -unsigned short reason; +unsigned short reason;struct mlme_priv *pmlmepriv = &padapter->mlmepriv;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;
@@ -1419,7 +1538,8 @@ unsigned int OnDeAuth(struct adapter *padapter, union recv_frame *precv_frame)int ignore_received_deauth =0 ;/* check A3 */ -if (memcmp (GetAddr3Ptr (pframe),get_my_bssid (&pmlmeinfo->network),ETH_ALEN )) +if (memcmp (GetAddr3Ptr (pframe),get_my_bssid (&pmlmeinfo->network), +ETH_ALEN ))return _SUCCESS; reason =le16_to_cpu (*(__le16 *)(pframe +WLAN_HDR_A3_LEN ));
@@ -1442,7 +1562,8 @@ unsigned int OnDeAuth(struct adapter *padapter, union recv_frame *precv_frame)if (!list_empty (&psta->asoc_list)) {list_del_init (&psta->asoc_list); pstapriv->asoc_list_cnt--; - updated =ap_free_sta (padapter, psta, false, reason); + updated =ap_free_sta (padapter, psta, false, + reason); }spin_unlock_bh (&pstapriv->asoc_list_lock);
@@ -1470,8 +1591,7 @@ unsigned int OnDeAuth(struct adapter *padapter, union recv_frame *precv_frame)netdev_dbg (padapter->pnetdev,"sta recv deauth reason code(%d) sta:%pM, ignore = %d\n" , - reason,GetAddr3Ptr (pframe), - ignore_received_deauth); + reason,GetAddr3Ptr (pframe), ignore_received_deauth);if (ignore_received_deauth ==0 )receive_disconnect (padapter,GetAddr3Ptr (pframe), reason);
@@ -1482,14 +1602,15 @@ unsigned int OnDeAuth(struct adapter *padapter, union recv_frame *precv_frame)unsigned int OnDisassoc (struct adapter *padapter,union recv_frame *precv_frame) { -unsigned short reason; +unsigned short reason;struct mlme_priv *pmlmepriv = &padapter->mlmepriv;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;u8 *pframe = precv_frame->u.hdr.rx_data;/* check A3 */ -if (memcmp (GetAddr3Ptr (pframe),get_my_bssid (&pmlmeinfo->network),ETH_ALEN )) +if (memcmp (GetAddr3Ptr (pframe),get_my_bssid (&pmlmeinfo->network), +ETH_ALEN ))return _SUCCESS; reason =le16_to_cpu (*(__le16 *)(pframe +WLAN_HDR_A3_LEN ));
@@ -1501,8 +1622,8 @@ unsigned int OnDisassoc(struct adapter *padapter, union recv_frame *precv_frame)/* rtw_free_stainfo(padapter, psta); */ netdev_dbg (padapter->pnetdev, -"ap recv disassoc reason code(%d) sta:%pM\n" , - reason,GetAddr2Ptr (pframe)); +"ap recv disassoc reason code(%d) sta:%pM\n" , reason, +GetAddr2Ptr (pframe)); psta =rtw_get_stainfo (pstapriv,GetAddr2Ptr (pframe));if (psta) {
@@ -1512,7 +1633,8 @@ unsigned int OnDisassoc(struct adapter *padapter, union recv_frame *precv_frame)if (!list_empty (&psta->asoc_list)) {list_del_init (&psta->asoc_list); pstapriv->asoc_list_cnt--; - updated =ap_free_sta (padapter, psta, false, reason); + updated =ap_free_sta (padapter, psta, false, + reason); }spin_unlock_bh (&pstapriv->asoc_list_lock);
@@ -1522,8 +1644,8 @@ unsigned int OnDisassoc(struct adapter *padapter, union recv_frame *precv_frame)return _SUCCESS; }netdev_dbg (padapter->pnetdev, -"sta recv disassoc reason code(%d) sta:%pM\n" , - reason,GetAddr3Ptr (pframe)); +"sta recv disassoc reason code(%d) sta:%pM\n" , reason, +GetAddr3Ptr (pframe));receive_disconnect (padapter,GetAddr3Ptr (pframe), reason);
@@ -1536,7 +1658,8 @@ unsigned int OnAtim(struct adapter *padapter, union recv_frame *precv_frame)return _SUCCESS; } -unsigned int on_action_spct (struct adapter *padapter,union recv_frame *precv_frame) +unsigned int on_action_spct (struct adapter *padapter, +union recv_frame *precv_frame) {struct sta_info *psta =NULL ;struct sta_priv *pstapriv = &padapter->stapriv;
@@ -1570,24 +1693,26 @@ unsigned int on_action_spct(struct adapter *padapter, union recv_frame *precv_frreturn _FAIL; } -unsigned int OnAction_back (struct adapter *padapter,union recv_frame *precv_frame) +unsigned int OnAction_back (struct adapter *padapter, +union recv_frame *precv_frame) {u8 *addr;struct sta_info *psta =NULL ;struct recv_reorder_ctrl *preorder_ctrl;unsigned char *frame_body;unsigned char category, action; -unsigned short tid, status; +unsigned short tid, status;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;u8 *pframe = precv_frame->u.hdr.rx_data;struct sta_priv *pstapriv = &padapter->stapriv;/* check RA matches or not */ -if (memcmp (myid (&(padapter->eeprompriv)),GetAddr1Ptr (pframe),ETH_ALEN ))/* for if1, sta/ap mode */ +if (memcmp (myid (&(padapter->eeprompriv)),GetAddr1Ptr (pframe), +ETH_ALEN ))/* for if1, sta/ap mode */ return _SUCCESS; -if ((pmlmeinfo->state&0x03 ) !=WIFI_FW_AP_STATE ) +if ((pmlmeinfo->state &0x03 ) !=WIFI_FW_AP_STATE )if (!(pmlmeinfo->state &WIFI_FW_ASSOC_SUCCESS ))return _SUCCESS;
@@ -1597,10 +1722,11 @@ unsigned int OnAction_back(struct adapter *padapter, union recv_frame *precv_fraif (!psta)return _SUCCESS; - frame_body = (unsigned char *)(pframe +sizeof (struct ieee80211_hdr_3addr )); + frame_body = + (unsigned char *)(pframe +sizeof (struct ieee80211_hdr_3addr )); category = frame_body[0 ]; -if (category ==RTW_WLAN_CATEGORY_BACK ) {/* representing Block Ack */ +if (category ==RTW_WLAN_CATEGORY_BACK ) {/* representing Block Ack */ if (!pmlmeinfo->HT_enable)return _SUCCESS;
@@ -1608,14 +1734,19 @@ unsigned int OnAction_back(struct adapter *padapter, union recv_frame *precv_fraswitch (action) {case WLAN_ACTION_ADDBA_REQ :/* ADDBA request */ -memcpy (&(pmlmeinfo->ADDBA_req), &(frame_body[2 ]),sizeof (struct ADDBA_request )); +memcpy (&(pmlmeinfo->ADDBA_req), &(frame_body[2 ]), +sizeof (struct ADDBA_request ));/* process_addba_req(padapter, (u8 *)&(pmlmeinfo->ADDBA_req), GetAddr3Ptr(pframe)); */ -process_addba_req (padapter, (u8 *)&(pmlmeinfo->ADDBA_req), addr); +process_addba_req (padapter, + (u8 *)&(pmlmeinfo->ADDBA_req), addr);if (pmlmeinfo->accept_addba_req) -issue_action_BA (padapter, addr,WLAN_ACTION_ADDBA_RESP ,0 ); +issue_action_BA (padapter, addr, +WLAN_ACTION_ADDBA_RESP ,0 );else -issue_action_BA (padapter, addr,WLAN_ACTION_ADDBA_RESP ,37 );/* reject ADDBA Req */ +issue_action_BA (padapter, addr, +WLAN_ACTION_ADDBA_RESP , +37 );/* reject ADDBA Req */ break ;
@@ -1648,7 +1779,7 @@ unsigned int OnAction_back(struct adapter *padapter, union recv_frame *precv_fra }else if ((frame_body[3 ] &BIT (3 )) ==BIT (3 )) { tid = (frame_body[3 ] >>4 ) &0x0F ; - preorder_ctrl = &psta->recvreorder_ctrl[tid]; + preorder_ctrl = &psta->recvreorder_ctrl[tid]; preorder_ctrl->enable = false; preorder_ctrl->indicate_seq =0xffff ; }
@@ -1667,13 +1798,13 @@ static s32 rtw_action_public_decache(union recv_frame *recv_frame, s32 token)struct adapter *adapter = recv_frame->u.hdr.adapter;struct mlme_ext_priv *mlmeext = &(adapter->mlmeextpriv);u8 *frame = recv_frame->u.hdr.rx_data; -u16 seq_ctrl = ((recv_frame->u.hdr.attrib.seq_num&0xffff ) <<4 ) | - (recv_frame->u.hdr.attrib.frag_num &0xf ); +u16 seq_ctrl = ((recv_frame->u.hdr.attrib.seq_num &0xffff ) <<4 ) | + (recv_frame->u.hdr.attrib.frag_num &0xf );if (GetRetry (frame)) {if (token >=0 ) { -if ((seq_ctrl == mlmeext->action_public_rxseq) - && (token == mlmeext->action_public_dialog_token)) +if ((seq_ctrl == mlmeext->action_public_rxseq) && + (token == mlmeext->action_public_dialog_token))return _FAIL; }else {if (seq_ctrl == mlmeext->action_public_rxseq)
@@ -1695,7 +1826,8 @@ static unsigned int on_action_public_p2p(union recv_frame *precv_frame)u8 *frame_body;u8 dialogToken =0 ; - frame_body = (unsigned char *)(pframe +sizeof (struct ieee80211_hdr_3addr )); + frame_body = + (unsigned char *)(pframe +sizeof (struct ieee80211_hdr_3addr )); dialogToken = frame_body[7 ];
@@ -1717,7 +1849,8 @@ static unsigned int on_action_public_vendor(union recv_frame *precv_frame)return ret; } -static unsigned int on_action_public_default (union recv_frame *precv_frame,u8 action) +static unsigned int on_action_public_default (union recv_frame *precv_frame, +u8 action) {unsigned int ret = _FAIL;u8 *pframe = precv_frame->u.hdr.rx_data;
@@ -1732,7 +1865,8 @@ static unsigned int on_action_public_default(union recv_frame *precv_frame, u8 aif (rtw_action_public_decache (precv_frame, token) == _FAIL) goto exit; -scnprintf (msg,sizeof (msg),"%s(token:%u)" ,action_public_str (action), token); +scnprintf (msg,sizeof (msg),"%s(token:%u)" ,action_public_str (action), + token);rtw_cfg80211_rx_action (adapter, pframe, frame_len, msg); ret = _SUCCESS;
@@ -1741,7 +1875,8 @@ static unsigned int on_action_public_default(union recv_frame *precv_frame, u8 areturn ret; } -unsigned int on_action_public (struct adapter *padapter,union recv_frame *precv_frame) +unsigned int on_action_public (struct adapter *padapter, +union recv_frame *precv_frame) {unsigned int ret = _FAIL;u8 *pframe = precv_frame->u.hdr.rx_data;
@@ -1749,7 +1884,8 @@ unsigned int on_action_public(struct adapter *padapter, union recv_frame *precv_u8 category, action;/* check RA matches or not */ -if (memcmp (myid (&(padapter->eeprompriv)),GetAddr1Ptr (pframe),ETH_ALEN )) +if (memcmp (myid (&(padapter->eeprompriv)),GetAddr1Ptr (pframe), +ETH_ALEN )) goto exit; category = frame_body[0 ];
@@ -1770,14 +1906,16 @@ unsigned int on_action_public(struct adapter *padapter, union recv_frame *precv_return ret; } -unsigned int OnAction_ht (struct adapter *padapter,union recv_frame *precv_frame) +unsigned int OnAction_ht (struct adapter *padapter, +union recv_frame *precv_frame) {u8 *pframe = precv_frame->u.hdr.rx_data;u8 *frame_body = pframe +sizeof (struct ieee80211_hdr_3addr );u8 category, action;/* check RA matches or not */ -if (memcmp (myid (&(padapter->eeprompriv)),GetAddr1Ptr (pframe),ETH_ALEN )) +if (memcmp (myid (&(padapter->eeprompriv)),GetAddr1Ptr (pframe), +ETH_ALEN )) goto exit; category = frame_body[0 ];
@@ -1797,15 +1935,17 @@ unsigned int OnAction_ht(struct adapter *padapter, union recv_frame *precv_framereturn _SUCCESS; } -unsigned int OnAction_sa_query (struct adapter *padapter,union recv_frame *precv_frame) +unsigned int OnAction_sa_query (struct adapter *padapter, +union recv_frame *precv_frame) {u8 *pframe = precv_frame->u.hdr.rx_data;struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);unsigned short tid; -switch (pframe[WLAN_HDR_A3_LEN +1 ]) { +switch (pframe[WLAN_HDR_A3_LEN +1 ]) {case 0 :/* SA Query req */ -memcpy (&tid, &pframe[WLAN_HDR_A3_LEN +2 ],sizeof (unsigned short )); +memcpy (&tid, &pframe[WLAN_HDR_A3_LEN +2 ], +sizeof (unsigned short ));issue_action_SA_Query (padapter,GetAddr2Ptr (pframe),1 , tid);break ;
@@ -1827,7 +1967,8 @@ unsigned int OnAction(struct adapter *padapter, union recv_frame *precv_frame)unsigned char *frame_body;u8 *pframe = precv_frame->u.hdr.rx_data; - frame_body = (unsigned char *)(pframe +sizeof (struct ieee80211_hdr_3addr )); + frame_body = + (unsigned char *)(pframe +sizeof (struct ieee80211_hdr_3addr )); category = frame_body[0 ];
@@ -1846,7 +1987,8 @@ unsigned int DoReserved(struct adapter *padapter, union recv_frame *precv_frame)return _SUCCESS; } -static struct xmit_frame *_alloc_mgtxmitframe (struct xmit_priv *pxmitpriv,bool once) +static struct xmit_frame *_alloc_mgtxmitframe (struct xmit_priv *pxmitpriv, +bool once) {struct xmit_frame *pmgntframe;struct xmit_buf *pxmitbuf;
@@ -1889,7 +2031,8 @@ void update_mgnt_tx_rate(struct adapter *padapter, u8 rate) pmlmeext->tx_rate = rate; } -void update_mgntframe_attrib (struct adapter *padapter,struct pkt_attrib *pattrib) +void update_mgntframe_attrib (struct adapter *padapter, +struct pkt_attrib *pattrib) {u8 wireless_mode;struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
@@ -1908,7 +2051,7 @@ void update_mgntframe_attrib(struct adapter *padapter, struct pkt_attrib *pattri wireless_mode =WIRELESS_11B ; else wireless_mode =WIRELESS_11G ; - pattrib->raid =rtw_get_mgntframe_raid (padapter, wireless_mode); + pattrib->raid =rtw_get_mgntframe_raid (padapter, wireless_mode); pattrib->rate = pmlmeext->tx_rate; pattrib->encrypt = _NO_PRIVACY_;
@@ -1927,10 +2070,11 @@ void update_mgntframe_attrib(struct adapter *padapter, struct pkt_attrib *pattri pattrib->mbssid =0 ; } -void update_mgntframe_attrib_addr (struct adapter *padapter,struct xmit_frame *pmgntframe) +void update_mgntframe_attrib_addr (struct adapter *padapter, +struct xmit_frame *pmgntframe) {u8 *pframe; -struct pkt_attrib *pattrib = &pmgntframe->attrib; +struct pkt_attrib *pattrib = &pmgntframe->attrib; pframe = (u8 *)(pmgntframe->buf_addr) +TXDESC_OFFSET ;
@@ -1940,8 +2084,7 @@ void update_mgntframe_attrib_addr(struct adapter *padapter, struct xmit_frame *pvoid dump_mgntframe (struct adapter *padapter,struct xmit_frame *pmgntframe) { -if (padapter->bSurpriseRemoved || - padapter->bDriverStopped) { +if (padapter->bSurpriseRemoved || padapter->bDriverStopped) {rtw_free_xmitbuf (&padapter->xmitpriv, pmgntframe->pxmitbuf);rtw_free_xmitframe (&padapter->xmitpriv, pmgntframe);return ;
@@ -1950,7 +2093,8 @@ void dump_mgntframe(struct adapter *padapter, struct xmit_frame *pmgntframe)rtw_hal_mgnt_xmit (padapter, pmgntframe); } -s32 dump_mgntframe_and_wait (struct adapter *padapter,struct xmit_frame *pmgntframe,int timeout_ms) +s32 dump_mgntframe_and_wait (struct adapter *padapter, +struct xmit_frame *pmgntframe,int timeout_ms) {s32 ret = _FAIL;unsigned long irqL;
@@ -1958,8 +2102,7 @@ s32 dump_mgntframe_and_wait(struct adapter *padapter, struct xmit_frame *pmgntfrstruct xmit_buf *pxmitbuf = pmgntframe->pxmitbuf;struct submit_ctx sctx; -if (padapter->bSurpriseRemoved || - padapter->bDriverStopped) { +if (padapter->bSurpriseRemoved || padapter->bDriverStopped) {rtw_free_xmitbuf (&padapter->xmitpriv, pmgntframe->pxmitbuf);rtw_free_xmitframe (&padapter->xmitpriv, pmgntframe);return ret;
@@ -1980,15 +2123,15 @@ s32 dump_mgntframe_and_wait(struct adapter *padapter, struct xmit_frame *pmgntfrreturn ret; } -s32 dump_mgntframe_and_wait_ack (struct adapter *padapter,struct xmit_frame *pmgntframe) +s32 dump_mgntframe_and_wait_ack (struct adapter *padapter, +struct xmit_frame *pmgntframe) {static u8 seq_no;s32 ret = _FAIL; -u32 timeout_ms =500 ;/* 500ms */ +u32 timeout_ms =500 ;/* 500ms */ struct xmit_priv *pxmitpriv = &padapter->xmitpriv; -if (padapter->bSurpriseRemoved || - padapter->bDriverStopped) { +if (padapter->bSurpriseRemoved || padapter->bDriverStopped) {rtw_free_xmitbuf (&padapter->xmitpriv, pmgntframe->pxmitbuf);rtw_free_xmitframe (&padapter->xmitpriv, pmgntframe);return -1 ;
@@ -2014,19 +2157,18 @@ static int update_hidden_ssid(u8 *ies, u32 ies_len, u8 hidden_ssid_mode)signed int ssid_len_ori;int len_diff =0 ; - ssid_ie =rtw_get_ie (ies,WLAN_EID_SSID , &ssid_len_ori, ies_len); + ssid_ie =rtw_get_ie (ies,WLAN_EID_SSID , &ssid_len_ori, ies_len);if (ssid_ie && ssid_len_ori >0 ) {switch (hidden_ssid_mode) { -case 1 : - { +case 1 : {u8 *next_ie = ssid_ie +2 + ssid_len_ori;u32 remain_len =0 ; - remain_len = ies_len - (next_ie-ies); + remain_len = ies_len - (next_ie - ies); ssid_ie[1 ] =0 ; -memcpy (ssid_ie+2 , next_ie, remain_len); +memcpy (ssid_ie +2 , next_ie, remain_len); len_diff -= ssid_len_ori;break ;
@@ -2036,7 +2178,7 @@ static int update_hidden_ssid(u8 *ies, u32 ies_len, u8 hidden_ssid_mode)break ;default :break ; - } + } }return len_diff;
@@ -2044,17 +2186,17 @@ static int update_hidden_ssid(u8 *ies, u32 ies_len, u8 hidden_ssid_mode)void issue_beacon (struct adapter *padapter,int timeout_ms) { -struct xmit_frame *pmgntframe; -struct pkt_attrib *pattrib; +struct xmit_frame *pmgntframe; +struct pkt_attrib *pattrib;unsigned char *pframe;struct ieee80211_hdr *pwlanhdr;__le16 *fctrl; -unsigned int rate_len; +unsigned int rate_len;struct xmit_priv *pxmitpriv = &(padapter->xmitpriv);struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info; -struct wlan_bssid_ex *cur_network = &(pmlmeinfo->network); +struct wlan_bssid_ex *cur_network = &(pmlmeinfo->network); pmgntframe =alloc_mgtxmitframe (pxmitpriv);if (!pmgntframe)
@@ -2079,23 +2221,25 @@ void issue_beacon(struct adapter *padapter, int timeout_ms)memcpy (pwlanhdr->addr2,myid (&(padapter->eeprompriv)),ETH_ALEN );memcpy (pwlanhdr->addr3,get_my_bssid (cur_network),ETH_ALEN ); -SetSeqNum (pwlanhdr,0 /*pmlmeext->mgnt_seq*/ ); +SetSeqNum (pwlanhdr,0 /*pmlmeext->mgnt_seq*/ );/* pmlmeext->mgnt_seq++; */ SetFrameSubType (pframe,WIFI_BEACON ); pframe +=sizeof (struct ieee80211_hdr_3addr ); pattrib->pktlen =sizeof (struct ieee80211_hdr_3addr ); -if ((pmlmeinfo->state&0x03 ) ==WIFI_FW_AP_STATE ) { +if ((pmlmeinfo->state &0x03 ) ==WIFI_FW_AP_STATE ) { {int len_diff; -memcpy (pframe, cur_network->ies, cur_network->ie_length); - len_diff =update_hidden_ssid (pframe+_BEACON_IE_OFFSET_, - cur_network->ie_length-_BEACON_IE_OFFSET_, - pmlmeinfo->hidden_ssid_mode); - pframe += (cur_network->ie_length+len_diff); - pattrib->pktlen += (cur_network->ie_length+len_diff); +memcpy (pframe, cur_network->ies, + cur_network->ie_length); + len_diff =update_hidden_ssid ( + pframe + _BEACON_IE_OFFSET_, + cur_network->ie_length - _BEACON_IE_OFFSET_, + pmlmeinfo->hidden_ssid_mode); + pframe += (cur_network->ie_length + len_diff); + pattrib->pktlen += (cur_network->ie_length + len_diff); } {
@@ -2103,10 +2247,19 @@ void issue_beacon(struct adapter *padapter, int timeout_ms)uint wps_ielen;u8 sr =0 ; - wps_ie =rtw_get_wps_ie (pmgntframe->buf_addr+TXDESC_OFFSET +sizeof (struct ieee80211_hdr_3addr )+_BEACON_IE_OFFSET_, - pattrib->pktlen-sizeof (struct ieee80211_hdr_3addr )-_BEACON_IE_OFFSET_,NULL , &wps_ielen); + wps_ie =rtw_get_wps_ie ( + pmgntframe->buf_addr +TXDESC_OFFSET + +sizeof (struct ieee80211_hdr_3addr ) + + _BEACON_IE_OFFSET_, + pattrib->pktlen - +sizeof (struct ieee80211_hdr_3addr ) - + _BEACON_IE_OFFSET_, +NULL , &wps_ielen);if (wps_ie && wps_ielen >0 ) -rtw_get_wps_attr_content (wps_ie, wps_ielen,WPS_ATTR_SELECTED_REGISTRAR , (u8 *)(&sr),NULL ); +rtw_get_wps_attr_content ( + wps_ie, wps_ielen, +WPS_ATTR_SELECTED_REGISTRAR , + (u8 *)(&sr),NULL );if (sr !=0 )set_fwstate (pmlmepriv,WIFI_UNDER_WPS );else
@@ -2124,27 +2277,39 @@ void issue_beacon(struct adapter *padapter, int timeout_ms)/* beacon interval: 2 bytes */ -memcpy (pframe, (unsigned char *)(rtw_get_beacon_interval_from_ie (cur_network->ies)),2 ); +memcpy (pframe, + (unsigned char *)(rtw_get_beacon_interval_from_ie ( + cur_network->ies)), +2 ); pframe +=2 ; pattrib->pktlen +=2 ;/* capability info: 2 bytes */ -memcpy (pframe, (unsigned char *)(rtw_get_capability_from_ie (cur_network->ies)),2 ); +memcpy (pframe, + (unsigned char *)(rtw_get_capability_from_ie (cur_network->ies)), +2 ); pframe +=2 ; pattrib->pktlen +=2 ;/* SSID */ - pframe =rtw_set_ie (pframe,WLAN_EID_SSID , cur_network->ssid.ssid_length, cur_network->ssid.ssid, &pattrib->pktlen); + pframe =rtw_set_ie (pframe,WLAN_EID_SSID , + cur_network->ssid.ssid_length, + cur_network->ssid.ssid, &pattrib->pktlen);/* supported rates... */ rate_len =rtw_get_rateset_len (cur_network->supported_rates); - pframe =rtw_set_ie (pframe,WLAN_EID_SUPP_RATES , ((rate_len >8 ) ?8 : rate_len), cur_network->supported_rates, &pattrib->pktlen); + pframe =rtw_set_ie (pframe,WLAN_EID_SUPP_RATES , + ((rate_len >8 ) ?8 : rate_len), + cur_network->supported_rates, &pattrib->pktlen);/* DS parameter set */ - pframe =rtw_set_ie (pframe,WLAN_EID_DS_PARAMS ,1 , (unsigned char *)&(cur_network->configuration.ds_config), &pattrib->pktlen); + pframe =rtw_set_ie ( + pframe,WLAN_EID_DS_PARAMS ,1 , + (unsigned char *)&(cur_network->configuration.ds_config), + &pattrib->pktlen);/* if ((pmlmeinfo->state&0x03) == WIFI_FW_ADHOC_STATE) */ {
@@ -2153,15 +2318,21 @@ void issue_beacon(struct adapter *padapter, int timeout_ms)/* IBSS Parameter Set... */ /* ATIMWindow = cur->configuration.ATIMWindow; */ ATIMWindow =0 ; - pframe =rtw_set_ie (pframe,WLAN_EID_IBSS_PARAMS ,2 , (unsigned char *)(&ATIMWindow), &pattrib->pktlen); + pframe =rtw_set_ie (pframe,WLAN_EID_IBSS_PARAMS ,2 , + (unsigned char *)(&ATIMWindow), + &pattrib->pktlen);/* ERP IE */ - pframe =rtw_set_ie (pframe,WLAN_EID_ERP_INFO ,1 , &erpinfo, &pattrib->pktlen); + pframe =rtw_set_ie (pframe,WLAN_EID_ERP_INFO ,1 , &erpinfo, + &pattrib->pktlen); }/* EXTERNDED SUPPORTED RATE */ if (rate_len >8 ) - pframe =rtw_set_ie (pframe,WLAN_EID_EXT_SUPP_RATES , (rate_len -8 ), (cur_network->supported_rates +8 ), &pattrib->pktlen); + pframe =rtw_set_ie (pframe,WLAN_EID_EXT_SUPP_RATES , + (rate_len -8 ), + (cur_network->supported_rates +8 ), + &pattrib->pktlen);/* todo:HT for adhoc */
@@ -2182,12 +2353,13 @@ void issue_beacon(struct adapter *padapter, int timeout_ms)dump_mgntframe (padapter, pmgntframe); } -void issue_probersp (struct adapter *padapter,unsigned char *da,u8 is_valid_p2p_probereq) +void issue_probersp (struct adapter *padapter,unsigned char *da, +u8 is_valid_p2p_probereq) { -struct xmit_frame *pmgntframe; -struct pkt_attrib *pattrib; +struct xmit_frame *pmgntframe; +struct pkt_attrib *pattrib;unsigned char *pframe; -struct ieee80211_hdr *pwlanhdr; +struct ieee80211_hdr *pwlanhdr;__le16 *fctrl;unsigned char *mac, *bssid;struct xmit_priv *pxmitpriv = &(padapter->xmitpriv);
@@ -2197,8 +2369,8 @@ void issue_probersp(struct adapter *padapter, unsigned char *da, u8 is_valid_p2pstruct mlme_priv *pmlmepriv = &padapter->mlmepriv;struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info; -struct wlan_bssid_ex *cur_network = &(pmlmeinfo->network); -unsigned int rate_len; +struct wlan_bssid_ex *cur_network = &(pmlmeinfo->network); +unsigned int rate_len;if (!da)return ;
@@ -2236,8 +2408,11 @@ void issue_probersp(struct adapter *padapter, unsigned char *da, u8 is_valid_p2pif (cur_network->ie_length >MAX_IE_SZ )return ; -if ((pmlmeinfo->state&0x03 ) ==WIFI_FW_AP_STATE ) { - pwps_ie =rtw_get_wps_ie (cur_network->ies+_FIXED_IE_LENGTH_, cur_network->ie_length-_FIXED_IE_LENGTH_,NULL , &wps_ielen); +if ((pmlmeinfo->state &0x03 ) ==WIFI_FW_AP_STATE ) { + pwps_ie =rtw_get_wps_ie (cur_network->ies + _FIXED_IE_LENGTH_, + cur_network->ie_length - + _FIXED_IE_LENGTH_, +NULL , &wps_ielen);/* inerset & update wps_probe_resp_ie */ if (pmlmepriv->wps_probe_resp_ie && pwps_ie && wps_ielen >0 ) {
@@ -2248,26 +2423,31 @@ void issue_probersp(struct adapter *padapter, unsigned char *da, u8 is_valid_p2p premainder_ie = pwps_ie + wps_ielen; - remainder_ielen = cur_network->ie_length - wps_offset - wps_ielen; + remainder_ielen = + cur_network->ie_length - wps_offset - wps_ielen;memcpy (pframe, cur_network->ies, wps_offset); pframe += wps_offset; pattrib->pktlen += wps_offset; - wps_ielen = (uint )pmlmepriv->wps_probe_resp_ie[1 ];/* to get ie data len */ -if ((wps_offset+wps_ielen+2 ) <=MAX_IE_SZ ) { -memcpy (pframe, pmlmepriv->wps_probe_resp_ie, wps_ielen+2 ); - pframe += wps_ielen+2 ; - pattrib->pktlen += wps_ielen+2 ; + wps_ielen = (uint )pmlmepriv->wps_probe_resp_ie + [1 ];/* to get ie data len */ +if ((wps_offset + wps_ielen +2 ) <=MAX_IE_SZ ) { +memcpy (pframe, pmlmepriv->wps_probe_resp_ie, + wps_ielen +2 ); + pframe += wps_ielen +2 ; + pattrib->pktlen += wps_ielen +2 ; } -if ((wps_offset+wps_ielen+2 +remainder_ielen) <=MAX_IE_SZ ) { +if ((wps_offset + wps_ielen +2 + remainder_ielen) <= +MAX_IE_SZ ) {memcpy (pframe, premainder_ie, remainder_ielen); pframe += remainder_ielen; pattrib->pktlen += remainder_ielen; } }else { -memcpy (pframe, cur_network->ies, cur_network->ie_length); +memcpy (pframe, cur_network->ies, + cur_network->ie_length); pframe += cur_network->ie_length; pattrib->pktlen += cur_network->ie_length; }
@@ -2278,35 +2458,43 @@ void issue_probersp(struct adapter *padapter, unsigned char *da, u8 is_valid_p2psigned int ssid_ielen;signed int ssid_ielen_diff;u8 *buf; -u8 *ies = pmgntframe->buf_addr+TXDESC_OFFSET +sizeof (struct ieee80211_hdr_3addr ); +u8 *ies = pmgntframe->buf_addr +TXDESC_OFFSET + +sizeof (struct ieee80211_hdr_3addr ); buf =kzalloc (MAX_IE_SZ ,GFP_ATOMIC );if (!buf)return ; - ssid_ie =rtw_get_ie (ies+_FIXED_IE_LENGTH_,WLAN_EID_SSID , &ssid_ielen, - (pframe-ies)-_FIXED_IE_LENGTH_); + ssid_ie = +rtw_get_ie (ies + _FIXED_IE_LENGTH_, +WLAN_EID_SSID , &ssid_ielen, + (pframe - ies) - _FIXED_IE_LENGTH_); - ssid_ielen_diff = cur_network->ssid.ssid_length - ssid_ielen; + ssid_ielen_diff = + cur_network->ssid.ssid_length - ssid_ielen; -if (ssid_ie && cur_network->ssid.ssid_length) { +if (ssid_ie && cur_network->ssid.ssid_length) {uint remainder_ielen;u8 *remainder_ie; - remainder_ie = ssid_ie+2 ; - remainder_ielen = (pframe-remainder_ie); + remainder_ie = ssid_ie +2 ; + remainder_ielen = (pframe - remainder_ie);if (remainder_ielen >MAX_IE_SZ ) { -netdev_warn (padapter->pnetdev, -FUNC_ADPT_FMT " remainder_ielen > MAX_IE_SZ\n" , -FUNC_ADPT_ARG (padapter)); +netdev_warn ( + padapter->pnetdev, +FUNC_ADPT_FMT +" remainder_ielen > MAX_IE_SZ\n" , +FUNC_ADPT_ARG (padapter)); remainder_ielen =MAX_IE_SZ ; }memcpy (buf, remainder_ie, remainder_ielen); -memcpy (remainder_ie+ssid_ielen_diff, buf, remainder_ielen); - *(ssid_ie+1 ) = cur_network->ssid.ssid_length; -memcpy (ssid_ie+2 , cur_network->ssid.ssid, cur_network->ssid.ssid_length); +memcpy (remainder_ie + ssid_ielen_diff, buf, + remainder_ielen); + *(ssid_ie +1 ) = cur_network->ssid.ssid_length; +memcpy (ssid_ie +2 , cur_network->ssid.ssid, + cur_network->ssid.ssid_length); pframe += ssid_ielen_diff; pattrib->pktlen += ssid_ielen_diff;
@@ -2320,14 +2508,20 @@ void issue_probersp(struct adapter *padapter, unsigned char *da, u8 is_valid_p2p/* beacon interval: 2 bytes */ -memcpy (pframe, (unsigned char *)(rtw_get_beacon_interval_from_ie (cur_network->ies)),2 ); +memcpy (pframe, + (unsigned char *)(rtw_get_beacon_interval_from_ie ( + cur_network->ies)), +2 ); pframe +=2 ; pattrib->pktlen +=2 ;/* capability info: 2 bytes */ -memcpy (pframe, (unsigned char *)(rtw_get_capability_from_ie (cur_network->ies)),2 ); +memcpy (pframe, + (unsigned char *)(rtw_get_capability_from_ie ( + cur_network->ies)), +2 ); pframe +=2 ; pattrib->pktlen +=2 ;
@@ -2335,30 +2529,45 @@ void issue_probersp(struct adapter *padapter, unsigned char *da, u8 is_valid_p2p/* below for ad-hoc mode */ /* SSID */ - pframe =rtw_set_ie (pframe,WLAN_EID_SSID , cur_network->ssid.ssid_length, cur_network->ssid.ssid, &pattrib->pktlen); + pframe =rtw_set_ie (pframe,WLAN_EID_SSID , + cur_network->ssid.ssid_length, + cur_network->ssid.ssid, &pattrib->pktlen);/* supported rates... */ rate_len =rtw_get_rateset_len (cur_network->supported_rates); - pframe =rtw_set_ie (pframe,WLAN_EID_SUPP_RATES , ((rate_len >8 ) ?8 : rate_len), cur_network->supported_rates, &pattrib->pktlen); + pframe =rtw_set_ie (pframe,WLAN_EID_SUPP_RATES , + ((rate_len >8 ) ?8 : rate_len), + cur_network->supported_rates, + &pattrib->pktlen);/* DS parameter set */ - pframe =rtw_set_ie (pframe,WLAN_EID_DS_PARAMS ,1 , (unsigned char *)&(cur_network->configuration.ds_config), &pattrib->pktlen); + pframe =rtw_set_ie ( + pframe,WLAN_EID_DS_PARAMS ,1 , + (unsigned char *)&( + cur_network->configuration.ds_config), + &pattrib->pktlen); -if ((pmlmeinfo->state&0x03 ) ==WIFI_FW_ADHOC_STATE ) { +if ((pmlmeinfo->state &0x03 ) ==WIFI_FW_ADHOC_STATE ) {u8 erpinfo =0 ;u32 ATIMWindow;/* IBSS Parameter Set... */ /* ATIMWindow = cur->configuration.ATIMWindow; */ ATIMWindow =0 ; - pframe =rtw_set_ie (pframe,WLAN_EID_IBSS_PARAMS ,2 , (unsigned char *)(&ATIMWindow), &pattrib->pktlen); + pframe =rtw_set_ie (pframe,WLAN_EID_IBSS_PARAMS ,2 , + (unsigned char *)(&ATIMWindow), + &pattrib->pktlen);/* ERP IE */ - pframe =rtw_set_ie (pframe,WLAN_EID_ERP_INFO ,1 , &erpinfo, &pattrib->pktlen); + pframe =rtw_set_ie (pframe,WLAN_EID_ERP_INFO ,1 , + &erpinfo, &pattrib->pktlen); }/* EXTERNDED SUPPORTED RATE */ if (rate_len >8 ) - pframe =rtw_set_ie (pframe,WLAN_EID_EXT_SUPP_RATES , (rate_len -8 ), (cur_network->supported_rates +8 ), &pattrib->pktlen); + pframe =rtw_set_ie (pframe,WLAN_EID_EXT_SUPP_RATES , + (rate_len -8 ), + (cur_network->supported_rates +8 ), + &pattrib->pktlen);/* todo:HT for adhoc */ }
@@ -2369,21 +2578,21 @@ void issue_probersp(struct adapter *padapter, unsigned char *da, u8 is_valid_p2p }static int _issue_probereq (struct adapter *padapter, -struct ndis_802_11_ssid *pssid, -u8 *da,u8 ch,bool append_wps,bool wait_ack) +struct ndis_802_11_ssid *pssid,u8 *da,u8 ch, +bool append_wps,bool wait_ack) {int ret = _FAIL; -struct xmit_frame *pmgntframe; -struct pkt_attrib *pattrib; +struct xmit_frame *pmgntframe; +struct pkt_attrib *pattrib;unsigned char *pframe; -struct ieee80211_hdr *pwlanhdr; +struct ieee80211_hdr *pwlanhdr;__le16 *fctrl;unsigned char *mac;unsigned char bssrate[NumRates];struct xmit_priv *pxmitpriv = &(padapter->xmitpriv);struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -int bssrate_len =0 ; +int bssrate_len =0 ; pmgntframe =alloc_mgtxmitframe (pxmitpriv);if (!pmgntframe)
@@ -2423,26 +2632,35 @@ static int _issue_probereq(struct adapter *padapter, pattrib->pktlen =sizeof (struct ieee80211_hdr_3addr );if (pssid) - pframe =rtw_set_ie (pframe,WLAN_EID_SSID , pssid->ssid_length, pssid->ssid, &(pattrib->pktlen)); + pframe =rtw_set_ie (pframe,WLAN_EID_SSID , pssid->ssid_length, + pssid->ssid, &(pattrib->pktlen));else - pframe =rtw_set_ie (pframe,WLAN_EID_SSID ,0 ,NULL , &(pattrib->pktlen)); + pframe =rtw_set_ie (pframe,WLAN_EID_SSID ,0 ,NULL , + &(pattrib->pktlen));get_rate_set (padapter, bssrate, &bssrate_len);if (bssrate_len >8 ) { - pframe =rtw_set_ie (pframe,WLAN_EID_SUPP_RATES ,8 , bssrate, &(pattrib->pktlen)); - pframe =rtw_set_ie (pframe,WLAN_EID_EXT_SUPP_RATES , (bssrate_len -8 ), (bssrate +8 ), &(pattrib->pktlen)); + pframe =rtw_set_ie (pframe,WLAN_EID_SUPP_RATES ,8 , bssrate, + &(pattrib->pktlen)); + pframe =rtw_set_ie (pframe,WLAN_EID_EXT_SUPP_RATES , + (bssrate_len -8 ), (bssrate +8 ), + &(pattrib->pktlen)); }else { - pframe =rtw_set_ie (pframe,WLAN_EID_SUPP_RATES , bssrate_len, bssrate, &(pattrib->pktlen)); + pframe =rtw_set_ie (pframe,WLAN_EID_SUPP_RATES , bssrate_len, + bssrate, &(pattrib->pktlen)); }if (ch) - pframe =rtw_set_ie (pframe,WLAN_EID_DS_PARAMS ,1 , &ch, &pattrib->pktlen); + pframe =rtw_set_ie (pframe,WLAN_EID_DS_PARAMS ,1 , &ch, + &pattrib->pktlen);if (append_wps) {/* add wps_ie for wps2.0 */ -if (pmlmepriv->wps_probe_req_ie_len >0 && pmlmepriv->wps_probe_req_ie) { -memcpy (pframe, pmlmepriv->wps_probe_req_ie, pmlmepriv->wps_probe_req_ie_len); +if (pmlmepriv->wps_probe_req_ie_len >0 && + pmlmepriv->wps_probe_req_ie) { +memcpy (pframe, pmlmepriv->wps_probe_req_ie, + pmlmepriv->wps_probe_req_ie_len); pframe += pmlmepriv->wps_probe_req_ie_len; pattrib->pktlen += pmlmepriv->wps_probe_req_ie_len; }
@@ -2461,13 +2679,14 @@ static int _issue_probereq(struct adapter *padapter,return ret; } -inline void issue_probereq (struct adapter *padapter,struct ndis_802_11_ssid *pssid,u8 *da) +inline void issue_probereq (struct adapter *padapter, +struct ndis_802_11_ssid *pssid,u8 *da) {_issue_probereq (padapter, pssid, da,0 ,1 , false); } -int issue_probereq_ex (struct adapter *padapter,struct ndis_802_11_ssid *pssid,u8 *da,u8 ch,bool append_wps, -int try_cnt,int wait_ms) +int issue_probereq_ex (struct adapter *padapter,struct ndis_802_11_ssid *pssid, +u8 *da,u8 ch,bool append_wps,int try_cnt,int wait_ms) {int ret;int i =0 ;
@@ -2488,9 +2707,9 @@ int issue_probereq_ex(struct adapter *padapter, struct ndis_802_11_ssid *pssid,if (ret != _FAIL) { ret = _SUCCESS; -#ifndef DBG_XMIT_ACK +#ifndef DBG_XMIT_ACK goto exit; -#endif +#endif } exit:
@@ -2498,15 +2717,16 @@ int issue_probereq_ex(struct adapter *padapter, struct ndis_802_11_ssid *pssid, }/* if psta == NULL, indicate we are station(client) now... */ -void issue_auth (struct adapter *padapter,struct sta_info *psta,unsigned short status) +void issue_auth (struct adapter *padapter,struct sta_info *psta, +unsigned short status) { -struct xmit_frame *pmgntframe; -struct pkt_attrib *pattrib; +struct xmit_frame *pmgntframe; +struct pkt_attrib *pattrib;unsigned char *pframe; -struct ieee80211_hdr *pwlanhdr; +struct ieee80211_hdr *pwlanhdr;__le16 *fctrl; -unsigned int val32; -unsigned short val16; +unsigned int val32; +unsigned short val16;int use_shared_key =0 ;struct xmit_priv *pxmitpriv = &(padapter->xmitpriv);struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
@@ -2538,8 +2758,10 @@ void issue_auth(struct adapter *padapter, struct sta_info *psta, unsigned shortif (psta) {/* for AP mode */ memcpy (pwlanhdr->addr1, psta->hwaddr,ETH_ALEN ); -memcpy (pwlanhdr->addr2,myid (&(padapter->eeprompriv)),ETH_ALEN ); -memcpy (pwlanhdr->addr3,myid (&(padapter->eeprompriv)),ETH_ALEN ); +memcpy (pwlanhdr->addr2,myid (&(padapter->eeprompriv)), +ETH_ALEN ); +memcpy (pwlanhdr->addr3,myid (&(padapter->eeprompriv)), +ETH_ALEN );/* setting auth algo number */ val16 = (u16 )psta->authalg;
@@ -2552,57 +2774,84 @@ void issue_auth(struct adapter *padapter, struct sta_info *psta, unsigned short le_tmp =cpu_to_le16 (val16); - pframe =rtw_set_fixed_ie (pframe, _AUTH_ALGM_NUM_, (unsigned char *)&le_tmp, &(pattrib->pktlen)); + pframe =rtw_set_fixed_ie (pframe, _AUTH_ALGM_NUM_, + (unsigned char *)&le_tmp, + &(pattrib->pktlen));/* setting auth seq number */ val16 = (u16 )psta->auth_seq; le_tmp =cpu_to_le16 (val16); - pframe =rtw_set_fixed_ie (pframe, _AUTH_SEQ_NUM_, (unsigned char *)&le_tmp, &(pattrib->pktlen)); + pframe =rtw_set_fixed_ie (pframe, _AUTH_SEQ_NUM_, + (unsigned char *)&le_tmp, + &(pattrib->pktlen));/* setting status code... */ val16 = status; le_tmp =cpu_to_le16 (val16); - pframe =rtw_set_fixed_ie (pframe, _STATUS_CODE_, (unsigned char *)&le_tmp, &(pattrib->pktlen)); + pframe =rtw_set_fixed_ie (pframe, _STATUS_CODE_, + (unsigned char *)&le_tmp, + &(pattrib->pktlen));/* added challenging text... */ -if ((psta->auth_seq ==2 ) && (psta->state &WIFI_FW_AUTH_STATE ) && (use_shared_key ==1 )) - pframe =rtw_set_ie (pframe,WLAN_EID_CHALLENGE ,128 , psta->chg_txt, &(pattrib->pktlen)); +if ((psta->auth_seq ==2 ) && + (psta->state &WIFI_FW_AUTH_STATE ) && (use_shared_key ==1 )) + pframe =rtw_set_ie (pframe,WLAN_EID_CHALLENGE ,128 , + psta->chg_txt, &(pattrib->pktlen)); }else { -memcpy (pwlanhdr->addr1,get_my_bssid (&pmlmeinfo->network),ETH_ALEN ); +memcpy (pwlanhdr->addr1,get_my_bssid (&pmlmeinfo->network), +ETH_ALEN );memcpy (pwlanhdr->addr2,myid (&padapter->eeprompriv),ETH_ALEN ); -memcpy (pwlanhdr->addr3,get_my_bssid (&pmlmeinfo->network),ETH_ALEN ); +memcpy (pwlanhdr->addr3,get_my_bssid (&pmlmeinfo->network), +ETH_ALEN );/* setting auth algo number */ - val16 = (pmlmeinfo->auth_algo == dot11AuthAlgrthm_Shared) ?1 :0 ;/* 0:OPEN System, 1:Shared key */ + val16 = (pmlmeinfo->auth_algo == dot11AuthAlgrthm_Shared) ? +1 : +0 ;/* 0:OPEN System, 1:Shared key */ if (val16) use_shared_key =1 ; le_tmp =cpu_to_le16 (val16);/* setting IV for auth seq #3 */ -if ((pmlmeinfo->auth_seq ==3 ) && (pmlmeinfo->state &WIFI_FW_AUTH_STATE ) && (use_shared_key ==1 )) { +if ((pmlmeinfo->auth_seq ==3 ) && + (pmlmeinfo->state &WIFI_FW_AUTH_STATE ) && + (use_shared_key ==1 )) {__le32 le_tmp32; - val32 = ((pmlmeinfo->iv++) | (pmlmeinfo->key_index <<30 )); + val32 = ((pmlmeinfo->iv++) | + (pmlmeinfo->key_index <<30 )); le_tmp32 =cpu_to_le32 (val32); - pframe =rtw_set_fixed_ie (pframe,4 , (unsigned char *)&le_tmp32, &(pattrib->pktlen)); + pframe =rtw_set_fixed_ie (pframe,4 , + (unsigned char *)&le_tmp32, + &(pattrib->pktlen)); pattrib->iv_len =4 ; } - pframe =rtw_set_fixed_ie (pframe, _AUTH_ALGM_NUM_, (unsigned char *)&le_tmp, &(pattrib->pktlen)); + pframe =rtw_set_fixed_ie (pframe, _AUTH_ALGM_NUM_, + (unsigned char *)&le_tmp, + &(pattrib->pktlen));/* setting auth seq number */ le_tmp =cpu_to_le16 (pmlmeinfo->auth_seq); - pframe =rtw_set_fixed_ie (pframe, _AUTH_SEQ_NUM_, (unsigned char *)&le_tmp, &(pattrib->pktlen)); + pframe =rtw_set_fixed_ie (pframe, _AUTH_SEQ_NUM_, + (unsigned char *)&le_tmp, + &(pattrib->pktlen));/* setting status code... */ le_tmp =cpu_to_le16 (status); - pframe =rtw_set_fixed_ie (pframe, _STATUS_CODE_, (unsigned char *)&le_tmp, &(pattrib->pktlen)); + pframe =rtw_set_fixed_ie (pframe, _STATUS_CODE_, + (unsigned char *)&le_tmp, + &(pattrib->pktlen));/* then checking to see if sending challenging text... */ -if ((pmlmeinfo->auth_seq ==3 ) && (pmlmeinfo->state &WIFI_FW_AUTH_STATE ) && (use_shared_key ==1 )) { - pframe =rtw_set_ie (pframe,WLAN_EID_CHALLENGE ,128 , pmlmeinfo->chg_txt, &(pattrib->pktlen)); +if ((pmlmeinfo->auth_seq ==3 ) && + (pmlmeinfo->state &WIFI_FW_AUTH_STATE ) && + (use_shared_key ==1 )) { + pframe =rtw_set_ie (pframe,WLAN_EID_CHALLENGE ,128 , + pmlmeinfo->chg_txt, + &(pattrib->pktlen));SetPrivacy (fctrl);
@@ -2622,10 +2871,11 @@ void issue_auth(struct adapter *padapter, struct sta_info *psta, unsigned shortdump_mgntframe (padapter, pmgntframe); } -void issue_asocrsp (struct adapter *padapter,unsigned short status,struct sta_info *pstat,int pkt_type) +void issue_asocrsp (struct adapter *padapter,unsigned short status, +struct sta_info *pstat,int pkt_type) { -struct xmit_frame *pmgntframe; -struct ieee80211_hdr *pwlanhdr; +struct xmit_frame *pmgntframe; +struct ieee80211_hdr *pwlanhdr;struct pkt_attrib *pattrib;unsigned char *pbuf, *pframe;unsigned short val;
@@ -2656,7 +2906,8 @@ void issue_asocrsp(struct adapter *padapter, unsigned short status, struct sta_imemcpy (GetAddr1Ptr (pwlanhdr), pstat->hwaddr,ETH_ALEN );memcpy (GetAddr2Ptr (pwlanhdr),myid (&(padapter->eeprompriv)),ETH_ALEN ); -memcpy (GetAddr3Ptr (pwlanhdr),get_my_bssid (&(pmlmeinfo->network)),ETH_ALEN ); +memcpy (GetAddr3Ptr (pwlanhdr),get_my_bssid (&(pmlmeinfo->network)), +ETH_ALEN );SetSeqNum (pwlanhdr, pmlmeext->mgnt_seq); pmlmeext->mgnt_seq++;
@@ -2672,19 +2923,28 @@ void issue_asocrsp(struct adapter *padapter, unsigned short status, struct sta_i/* capability */ val = *(unsigned short *)rtw_get_capability_from_ie (ie); - pframe =rtw_set_fixed_ie (pframe, _CAPABILITY_, (unsigned char *)&val, &(pattrib->pktlen)); + pframe =rtw_set_fixed_ie (pframe, _CAPABILITY_, (unsigned char *)&val, + &(pattrib->pktlen)); lestatus =cpu_to_le16 (status); - pframe =rtw_set_fixed_ie (pframe, _STATUS_CODE_, (unsigned char *)&lestatus, &(pattrib->pktlen)); + pframe =rtw_set_fixed_ie (pframe, _STATUS_CODE_, + (unsigned char *)&lestatus, + &(pattrib->pktlen)); le_tmp =cpu_to_le16 (pstat->aid |BIT (14 ) |BIT (15 )); - pframe =rtw_set_fixed_ie (pframe, _ASOC_ID_, (unsigned char *)&le_tmp, &(pattrib->pktlen)); + pframe =rtw_set_fixed_ie (pframe, _ASOC_ID_, (unsigned char *)&le_tmp, + &(pattrib->pktlen));if (pstat->bssratelen <=8 ) { - pframe =rtw_set_ie (pframe,WLAN_EID_SUPP_RATES , pstat->bssratelen, pstat->bssrateset, &(pattrib->pktlen)); + pframe =rtw_set_ie (pframe,WLAN_EID_SUPP_RATES , + pstat->bssratelen, pstat->bssrateset, + &(pattrib->pktlen)); }else { - pframe =rtw_set_ie (pframe,WLAN_EID_SUPP_RATES ,8 , pstat->bssrateset, &(pattrib->pktlen)); - pframe =rtw_set_ie (pframe,WLAN_EID_EXT_SUPP_RATES , (pstat->bssratelen-8 ), pstat->bssrateset+8 , &(pattrib->pktlen)); + pframe =rtw_set_ie (pframe,WLAN_EID_SUPP_RATES ,8 , + pstat->bssrateset, &(pattrib->pktlen)); + pframe =rtw_set_ie (pframe,WLAN_EID_EXT_SUPP_RATES , + (pstat->bssratelen -8 ), + pstat->bssrateset +8 , &(pattrib->pktlen)); }if ((pstat->flags &WLAN_STA_HT ) && (pmlmepriv->htpriv.ht_option)) {
@@ -2692,34 +2952,42 @@ void issue_asocrsp(struct adapter *padapter, unsigned short status, struct sta_i/* FILL HT CAP INFO IE */ /* p = hostapd_eid_ht_capabilities_info(hapd, p); */ - pbuf =rtw_get_ie (ie + _BEACON_IE_OFFSET_,WLAN_EID_HT_CAPABILITY , &ie_len, (pnetwork->ie_length - _BEACON_IE_OFFSET_)); + pbuf =rtw_get_ie (ie + _BEACON_IE_OFFSET_, +WLAN_EID_HT_CAPABILITY , &ie_len, + (pnetwork->ie_length - _BEACON_IE_OFFSET_));if (pbuf && ie_len >0 ) { -memcpy (pframe, pbuf, ie_len+2 ); - pframe += (ie_len+2 ); - pattrib->pktlen += (ie_len+2 ); +memcpy (pframe, pbuf, ie_len +2 ); + pframe += (ie_len +2 ); + pattrib->pktlen += (ie_len +2 ); }/* FILL HT ADD INFO IE */ /* p = hostapd_eid_ht_operation(hapd, p); */ - pbuf =rtw_get_ie (ie + _BEACON_IE_OFFSET_,WLAN_EID_HT_OPERATION , &ie_len, (pnetwork->ie_length - _BEACON_IE_OFFSET_)); + pbuf =rtw_get_ie (ie + _BEACON_IE_OFFSET_, +WLAN_EID_HT_OPERATION , &ie_len, + (pnetwork->ie_length - _BEACON_IE_OFFSET_));if (pbuf && ie_len >0 ) { -memcpy (pframe, pbuf, ie_len+2 ); - pframe += (ie_len+2 ); - pattrib->pktlen += (ie_len+2 ); +memcpy (pframe, pbuf, ie_len +2 ); + pframe += (ie_len +2 ); + pattrib->pktlen += (ie_len +2 ); } }/* FILL WMM IE */ if ((pstat->flags &WLAN_STA_WME ) && (pmlmepriv->qospriv.qos_option)) {uint ie_len =0 ; -unsigned char WMM_PARA_IE [] = {0x00 ,0x50 ,0xf2 ,0x02 ,0x01 ,0x01 }; - -for (pbuf = ie + _BEACON_IE_OFFSET_; ; pbuf += (ie_len +2 )) { - pbuf =rtw_get_ie (pbuf,WLAN_EID_VENDOR_SPECIFIC , &ie_len, (pnetwork->ie_length - _BEACON_IE_OFFSET_ - (ie_len +2 ))); -if (pbuf && !memcmp (pbuf+2 ,WMM_PARA_IE ,6 )) { -memcpy (pframe, pbuf, ie_len+2 ); - pframe += (ie_len+2 ); - pattrib->pktlen += (ie_len+2 ); +unsigned char WMM_PARA_IE [] = {0x00 ,0x50 ,0xf2 , +0x02 ,0x01 ,0x01 }; + +for (pbuf = ie + _BEACON_IE_OFFSET_;; pbuf += (ie_len +2 )) { + pbuf =rtw_get_ie (pbuf,WLAN_EID_VENDOR_SPECIFIC , + &ie_len, + (pnetwork->ie_length - + _BEACON_IE_OFFSET_ - (ie_len +2 ))); +if (pbuf && !memcmp (pbuf +2 ,WMM_PARA_IE ,6 )) { +memcpy (pframe, pbuf, ie_len +2 ); + pframe += (ie_len +2 ); + pattrib->pktlen += (ie_len +2 );break ; }
@@ -2730,11 +2998,14 @@ void issue_asocrsp(struct adapter *padapter, unsigned short status, struct sta_i }if (pmlmeinfo->assoc_AP_vendor ==HT_IOT_PEER_REALTEK ) - pframe =rtw_set_ie (pframe,WLAN_EID_VENDOR_SPECIFIC ,6 ,REALTEK_96B_IE , &(pattrib->pktlen)); + pframe =rtw_set_ie (pframe,WLAN_EID_VENDOR_SPECIFIC ,6 , +REALTEK_96B_IE , &(pattrib->pktlen));/* add WPS IE ie for wps 2.0 */ -if (pmlmepriv->wps_assoc_resp_ie && pmlmepriv->wps_assoc_resp_ie_len >0 ) { -memcpy (pframe, pmlmepriv->wps_assoc_resp_ie, pmlmepriv->wps_assoc_resp_ie_len); +if (pmlmepriv->wps_assoc_resp_ie && + pmlmepriv->wps_assoc_resp_ie_len >0 ) { +memcpy (pframe, pmlmepriv->wps_assoc_resp_ie, + pmlmepriv->wps_assoc_resp_ie_len); pframe += pmlmepriv->wps_assoc_resp_ie_len; pattrib->pktlen += pmlmepriv->wps_assoc_resp_ie_len;
@@ -2748,20 +3019,20 @@ void issue_asocrsp(struct adapter *padapter, unsigned short status, struct sta_ivoid issue_assocreq (struct adapter *padapter) {int ret = _FAIL; -struct xmit_frame *pmgntframe; -struct pkt_attrib *pattrib; +struct xmit_frame *pmgntframe; +struct pkt_attrib *pattrib;unsigned char *pframe; -struct ieee80211_hdr *pwlanhdr; +struct ieee80211_hdr *pwlanhdr;__le16 *fctrl;__le16 val16; -unsigned int i, j, index =0 ; +unsigned int i, j, index =0 ;unsigned char bssrate[NumRates], sta_bssrate[NumRates];struct ndis_80211_var_ie *pIE;struct xmit_priv *pxmitpriv = &(padapter->xmitpriv);struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info; -int bssrate_len =0 , sta_bssrate_len =0 ; +int bssrate_len =0 , sta_bssrate_len =0 ;u8 vs_ie_length =0 ; pmgntframe =alloc_mgtxmitframe (pxmitpriv);
@@ -2804,14 +3075,17 @@ void issue_assocreq(struct adapter *padapter) pattrib->pktlen +=2 ;/* SSID */ - pframe =rtw_set_ie (pframe,WLAN_EID_SSID , pmlmeinfo->network.ssid.ssid_length, pmlmeinfo->network.ssid.ssid, &(pattrib->pktlen)); + pframe =rtw_set_ie (pframe,WLAN_EID_SSID , + pmlmeinfo->network.ssid.ssid_length, + pmlmeinfo->network.ssid.ssid, &(pattrib->pktlen));/* supported rate & extended supported rate */ /* Check if the AP's supported rates are also supported by STA. */ get_rate_set (padapter, sta_bssrate, &sta_bssrate_len); -if (pmlmeext->cur_channel ==14 )/* for JAPAN, channel 14 can only uses B Mode(CCK) */ +if (pmlmeext->cur_channel == +14 )/* for JAPAN, channel 14 can only uses B Mode(CCK) */ sta_bssrate_len =4 ;/* for (i = 0; i < sta_bssrate_len; i++) { */
@@ -2828,15 +3102,17 @@ void issue_assocreq(struct adapter *padapter)/* Check if the AP's supported rates are also supported by STA. */ for (j =0 ; j < sta_bssrate_len; j++) { -/* Avoid the proprietary data rate (22Mbps) of Handlink WSG-4000 AP */ -if ((pmlmeinfo->network.supported_rates[i] |IEEE80211_BASIC_RATE_MASK ) - == (sta_bssrate[j] |IEEE80211_BASIC_RATE_MASK )) +/* Avoid the proprietary data rate (22Mbps) of Handlink WSG-4000 AP */ +if ((pmlmeinfo->network.supported_rates[i] | +IEEE80211_BASIC_RATE_MASK ) == + (sta_bssrate[j] |IEEE80211_BASIC_RATE_MASK ))break ; }if (j != sta_bssrate_len)/* the rate is supported by STA */ - bssrate[index++] = pmlmeinfo->network.supported_rates[i]; + bssrate[index++] = + pmlmeinfo->network.supported_rates[i]; } bssrate_len = index;
@@ -2848,22 +3124,28 @@ void issue_assocreq(struct adapter *padapter) }if (bssrate_len >8 ) { - pframe =rtw_set_ie (pframe,WLAN_EID_SUPP_RATES ,8 , bssrate, &(pattrib->pktlen)); - pframe =rtw_set_ie (pframe,WLAN_EID_EXT_SUPP_RATES , (bssrate_len -8 ), (bssrate +8 ), &(pattrib->pktlen)); + pframe =rtw_set_ie (pframe,WLAN_EID_SUPP_RATES ,8 , bssrate, + &(pattrib->pktlen)); + pframe =rtw_set_ie (pframe,WLAN_EID_EXT_SUPP_RATES , + (bssrate_len -8 ), (bssrate +8 ), + &(pattrib->pktlen)); }else - pframe =rtw_set_ie (pframe,WLAN_EID_SUPP_RATES , bssrate_len, bssrate, &(pattrib->pktlen)); + pframe =rtw_set_ie (pframe,WLAN_EID_SUPP_RATES , bssrate_len, + bssrate, &(pattrib->pktlen));/* vendor specific IE, such as WPA, WMM, WPS */ -for (i =sizeof (struct ndis_802_11_fix_ie ); i < pmlmeinfo->network.ie_length;) { +for (i =sizeof (struct ndis_802_11_fix_ie ); + i < pmlmeinfo->network.ie_length;) { pIE = (struct ndis_80211_var_ie *)(pmlmeinfo->network.ies + i);switch (pIE->element_id) {case WLAN_EID_VENDOR_SPECIFIC :if ((!memcmp (pIE->data,RTW_WPA_OUI ,4 )) || - (!memcmp (pIE->data,WMM_OUI ,4 )) || - (!memcmp (pIE->data,WPS_OUI ,4 ))) { + (!memcmp (pIE->data,WMM_OUI ,4 )) || + (!memcmp (pIE->data,WPS_OUI ,4 ))) { vs_ie_length = pIE->length; -if ((!padapter->registrypriv.wifi_spec) && (!memcmp (pIE->data,WPS_OUI ,4 ))) { +if ((!padapter->registrypriv.wifi_spec) && + (!memcmp (pIE->data,WPS_OUI ,4 ))) {/* Commented by Kurt 20110629 * In some older APs, WPS handshake * would be fail if we append vendor
@@ -2873,25 +3155,37 @@ void issue_assocreq(struct adapter *padapter) vs_ie_length =14 ; } - pframe =rtw_set_ie (pframe,WLAN_EID_VENDOR_SPECIFIC , vs_ie_length, pIE->data, &(pattrib->pktlen)); + pframe =rtw_set_ie (pframe, +WLAN_EID_VENDOR_SPECIFIC , + vs_ie_length, pIE->data, + &(pattrib->pktlen)); }break ;case WLAN_EID_RSN : - pframe =rtw_set_ie (pframe,WLAN_EID_RSN , pIE->length, pIE->data, &(pattrib->pktlen)); + pframe =rtw_set_ie (pframe,WLAN_EID_RSN , pIE->length, + pIE->data, &(pattrib->pktlen));break ;case WLAN_EID_HT_CAPABILITY :if (padapter->mlmepriv.htpriv.ht_option) {if (!(is_ap_in_tkip (padapter))) { -memcpy (&(pmlmeinfo->HT_caps), pIE->data,sizeof (struct HT_caps_element )); - pframe =rtw_set_ie (pframe,WLAN_EID_HT_CAPABILITY , pIE->length, (u8 *)(&(pmlmeinfo->HT_caps)), &(pattrib->pktlen)); +memcpy (&(pmlmeinfo->HT_caps), pIE->data, +sizeof (struct HT_caps_element )); + pframe =rtw_set_ie ( + pframe,WLAN_EID_HT_CAPABILITY , + pIE->length, + (u8 *)(&(pmlmeinfo->HT_caps)), + &(pattrib->pktlen)); } }break ;case WLAN_EID_EXT_CAPABILITY :if (padapter->mlmepriv.htpriv.ht_option) - pframe =rtw_set_ie (pframe,WLAN_EID_EXT_CAPABILITY , pIE->length, pIE->data, &(pattrib->pktlen)); + pframe =rtw_set_ie (pframe, +WLAN_EID_EXT_CAPABILITY , + pIE->length, pIE->data, + &(pattrib->pktlen));break ;default :break ;
@@ -2901,7 +3195,8 @@ void issue_assocreq(struct adapter *padapter) }if (pmlmeinfo->assoc_AP_vendor ==HT_IOT_PEER_REALTEK ) - pframe =rtw_set_ie (pframe,WLAN_EID_VENDOR_SPECIFIC ,6 ,REALTEK_96B_IE , &(pattrib->pktlen)); + pframe =rtw_set_ie (pframe,WLAN_EID_VENDOR_SPECIFIC ,6 , +REALTEK_96B_IE , &(pattrib->pktlen)); pattrib->last_txcmdsz = pattrib->pktlen;dump_mgntframe (padapter, pmgntframe);
@@ -2910,7 +3205,8 @@ void issue_assocreq(struct adapter *padapter) exit:if (ret == _SUCCESS) -rtw_buf_update (&pmlmepriv->assoc_req, &pmlmepriv->assoc_req_len, (u8 *)pwlanhdr, pattrib->pktlen); +rtw_buf_update (&pmlmepriv->assoc_req, &pmlmepriv->assoc_req_len, + (u8 *)pwlanhdr, pattrib->pktlen);else rtw_buf_free (&pmlmepriv->assoc_req, &pmlmepriv->assoc_req_len); }
@@ -2920,10 +3216,10 @@ static int _issue_nulldata(struct adapter *padapter, unsigned char *da, unsigned int power_mode, bool wait_ack) { int ret = _FAIL; -struct xmit_frame *pmgntframe; -struct pkt_attrib *pattrib; +struct xmit_frame *pmgntframe; +struct pkt_attrib *pattrib;unsigned char *pframe; -struct ieee80211_hdr *pwlanhdr; +struct ieee80211_hdr *pwlanhdr;__le16 *fctrl;struct xmit_priv *pxmitpriv;struct mlme_ext_priv *pmlmeext;
@@ -2953,9 +3249,9 @@ static int _issue_nulldata(struct adapter *padapter, unsigned char *da, fctrl = &(pwlanhdr->frame_control); *(fctrl) =0 ; -if ((pmlmeinfo->state&0x03 ) ==WIFI_FW_AP_STATE ) +if ((pmlmeinfo->state &0x03 ) ==WIFI_FW_AP_STATE )SetFrDs (fctrl); -else if ((pmlmeinfo->state&0x03 ) ==WIFI_FW_STATION_STATE ) +else if ((pmlmeinfo->state &0x03 ) ==WIFI_FW_STATION_STATE )SetToDs (fctrl);if (power_mode)
@@ -2991,7 +3287,8 @@ static int _issue_nulldata(struct adapter *padapter, unsigned char *da,* When wait_ms > 0, this function should be called at process context * da == NULL for station mode */ -int issue_nulldata (struct adapter *padapter,unsigned char *da,unsigned int power_mode,int try_cnt,int wait_ms) +int issue_nulldata (struct adapter *padapter,unsigned char *da, +unsigned int power_mode,int try_cnt,int wait_ms) {int ret;int i =0 ;
@@ -3028,9 +3325,9 @@ int issue_nulldata(struct adapter *padapter, unsigned char *da, unsigned int powif (ret != _FAIL) { ret = _SUCCESS; -#ifndef DBG_XMIT_ACK +#ifndef DBG_XMIT_ACK goto exit; -#endif +#endif } exit:
@@ -3063,10 +3360,10 @@ static int _issue_qos_nulldata(struct adapter *padapter, unsigned char *da, u16 tid, bool wait_ack) { int ret = _FAIL; -struct xmit_frame *pmgntframe; -struct pkt_attrib *pattrib; +struct xmit_frame *pmgntframe; +struct pkt_attrib *pattrib;unsigned char *pframe; -struct ieee80211_hdr *pwlanhdr; +struct ieee80211_hdr *pwlanhdr;__le16 *fctrl;u16 *qc;struct xmit_priv *pxmitpriv = &(padapter->xmitpriv);
@@ -3095,9 +3392,9 @@ static int _issue_qos_nulldata(struct adapter *padapter, unsigned char *da, fctrl = &(pwlanhdr->frame_control); *(fctrl) =0 ; -if ((pmlmeinfo->state&0x03 ) ==WIFI_FW_AP_STATE ) +if ((pmlmeinfo->state &0x03 ) ==WIFI_FW_AP_STATE )SetFrDs (fctrl); -else if ((pmlmeinfo->state&0x03 ) ==WIFI_FW_STATION_STATE ) +else if ((pmlmeinfo->state &0x03 ) ==WIFI_FW_STATION_STATE )SetToDs (fctrl); qc = (unsigned short *)(pframe + pattrib->hdrlen -2 );
@@ -3134,7 +3431,8 @@ static int _issue_qos_nulldata(struct adapter *padapter, unsigned char *da,/* when wait_ms >0 , this function should be called at process context */ /* da == NULL for station mode */ -int issue_qos_nulldata (struct adapter *padapter,unsigned char *da,u16 tid,int try_cnt,int wait_ms) +int issue_qos_nulldata (struct adapter *padapter,unsigned char *da,u16 tid, +int try_cnt,int wait_ms) {int ret;int i =0 ;
@@ -3160,9 +3458,9 @@ int issue_qos_nulldata(struct adapter *padapter, unsigned char *da, u16 tid, intif (ret != _FAIL) { ret = _SUCCESS; -#ifndef DBG_XMIT_ACK +#ifndef DBG_XMIT_ACK goto exit; -#endif +#endif } exit:
@@ -3172,10 +3470,10 @@ int issue_qos_nulldata(struct adapter *padapter, unsigned char *da, u16 tid, intstatic int _issue_deauth (struct adapter *padapter,unsigned char *da,unsigned short reason,bool wait_ack) { -struct xmit_frame *pmgntframe; -struct pkt_attrib *pattrib; +struct xmit_frame *pmgntframe; +struct pkt_attrib *pattrib;unsigned char *pframe; -struct ieee80211_hdr *pwlanhdr; +struct ieee80211_hdr *pwlanhdr;__le16 *fctrl;struct xmit_priv *pxmitpriv = &(padapter->xmitpriv);struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
@@ -3212,7 +3510,8 @@ static int _issue_deauth(struct adapter *padapter, unsigned char *da, pattrib->pktlen =sizeof (struct ieee80211_hdr_3addr ); le_tmp =cpu_to_le16 (reason); - pframe =rtw_set_fixed_ie (pframe, _RSON_CODE_, (unsigned char *)&le_tmp, &(pattrib->pktlen)); + pframe =rtw_set_fixed_ie (pframe, _RSON_CODE_, (unsigned char *)&le_tmp, + &(pattrib->pktlen)); pattrib->last_txcmdsz = pattrib->pktlen;
@@ -3227,13 +3526,14 @@ static int _issue_deauth(struct adapter *padapter, unsigned char *da,return ret; } -int issue_deauth (struct adapter *padapter,unsigned char *da,unsigned short reason) +int issue_deauth (struct adapter *padapter,unsigned char *da, +unsigned short reason) {return _issue_deauth (padapter, da, reason, false); } -int issue_deauth_ex (struct adapter *padapter,u8 *da,unsigned short reason,int try_cnt, -int wait_ms) +int issue_deauth_ex (struct adapter *padapter,u8 *da,unsigned short reason, +int try_cnt,int wait_ms) {int ret;int i =0 ;
@@ -3253,22 +3553,23 @@ int issue_deauth_ex(struct adapter *padapter, u8 *da, unsigned short reason, intif (ret != _FAIL) { ret = _SUCCESS; -#ifndef DBG_XMIT_ACK +#ifndef DBG_XMIT_ACK goto exit; -#endif +#endif } exit:return ret; } -void issue_action_SA_Query (struct adapter *padapter,unsigned char *raddr,unsigned char action,unsigned short tid) +void issue_action_SA_Query (struct adapter *padapter,unsigned char *raddr, +unsigned char action,unsigned short tid) {u8 category =RTW_WLAN_CATEGORY_SA_QUERY ; -struct xmit_frame *pmgntframe; -struct pkt_attrib *pattrib; +struct xmit_frame *pmgntframe; +struct pkt_attrib *pattrib;u8 *pframe; -struct ieee80211_hdr *pwlanhdr; +struct ieee80211_hdr *pwlanhdr;__le16 *fctrl;struct xmit_priv *pxmitpriv = &(padapter->xmitpriv);struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
@@ -3294,7 +3595,8 @@ void issue_action_SA_Query(struct adapter *padapter, unsigned char *raddr, unsigif (raddr)memcpy (pwlanhdr->addr1, raddr,ETH_ALEN );else -memcpy (pwlanhdr->addr1,get_my_bssid (&(pmlmeinfo->network)),ETH_ALEN ); +memcpy (pwlanhdr->addr1,get_my_bssid (&(pmlmeinfo->network)), +ETH_ALEN );memcpy (pwlanhdr->addr2,myid (&(padapter->eeprompriv)),ETH_ALEN );memcpy (pwlanhdr->addr3,get_my_bssid (&(pmlmeinfo->network)),ETH_ALEN );
@@ -3310,7 +3612,9 @@ void issue_action_SA_Query(struct adapter *padapter, unsigned char *raddr, unsigswitch (action) {case 0 :/* SA Query req */ - pframe =rtw_set_fixed_ie (pframe,2 , (unsigned char *)&pmlmeext->sa_query_seq, &pattrib->pktlen); + pframe =rtw_set_fixed_ie ( + pframe,2 , (unsigned char *)&pmlmeext->sa_query_seq, + &pattrib->pktlen); pmlmeext->sa_query_seq++;/* send sa query request to AP, AP should reply sa query response in 1 second */ set_sa_query_timer (pmlmeext,1000 );
@@ -3318,7 +3622,8 @@ void issue_action_SA_Query(struct adapter *padapter, unsigned char *raddr, unsigcase 1 :/* SA Query rsp */ le_tmp =cpu_to_le16 (tid); - pframe =rtw_set_fixed_ie (pframe,2 , (unsigned char *)&le_tmp, &pattrib->pktlen); + pframe =rtw_set_fixed_ie (pframe,2 , (unsigned char *)&le_tmp, + &pattrib->pktlen);break ;default :break ;
@@ -3329,7 +3634,8 @@ void issue_action_SA_Query(struct adapter *padapter, unsigned char *raddr, unsigdump_mgntframe (padapter, pmgntframe); } -void issue_action_BA (struct adapter *padapter,unsigned char *raddr,unsigned char action,unsigned short status) +void issue_action_BA (struct adapter *padapter,unsigned char *raddr, +unsigned char action,unsigned short status) {u8 category =RTW_WLAN_CATEGORY_BACK ;u16 start_seq;
@@ -3338,10 +3644,10 @@ void issue_action_BA(struct adapter *padapter, unsigned char *raddr, unsigned chu16 BA_timeout_value;u16 BA_starting_seqctrl =0 ;enum ieee80211_max_ampdu_length_exp max_rx_ampdu_factor; -struct xmit_frame *pmgntframe; -struct pkt_attrib *pattrib; +struct xmit_frame *pmgntframe; +struct pkt_attrib *pattrib;u8 *pframe; -struct ieee80211_hdr *pwlanhdr; +struct ieee80211_hdr *pwlanhdr;__le16 *fctrl;struct xmit_priv *pxmitpriv = &(padapter->xmitpriv);struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
@@ -3388,87 +3694,149 @@ void issue_action_BA(struct adapter *padapter, unsigned char *raddr, unsigned chdo { pmlmeinfo->dialogToken++; }while (pmlmeinfo->dialogToken ==0 ); - pframe =rtw_set_fixed_ie (pframe,1 , &(pmlmeinfo->dialogToken), &(pattrib->pktlen)); + pframe =rtw_set_fixed_ie (pframe,1 , + &(pmlmeinfo->dialogToken), + &(pattrib->pktlen));if (hal_btcoex_IsBTCoexCtrlAMPDUSize (padapter)) {/* A-MSDU NOT Supported */ BA_para_set =0 ;/* immediate Block Ack */ - BA_para_set |=BIT (1 ) &IEEE80211_ADDBA_PARAM_POLICY_MASK ; + BA_para_set |= +BIT (1 ) & +IEEE80211_ADDBA_PARAM_POLICY_MASK ;/* TID */ - BA_para_set |= (status <<2 ) &IEEE80211_ADDBA_PARAM_TID_MASK ; + BA_para_set |= (status <<2 ) & +IEEE80211_ADDBA_PARAM_TID_MASK ;/* max buffer size is 8 MSDU */ - BA_para_set |= (8 <<6 ) &IEEE80211_ADDBA_PARAM_BUF_SIZE_MASK ; + BA_para_set |= + (8 <<6 ) & +IEEE80211_ADDBA_PARAM_BUF_SIZE_MASK ; }else { - BA_para_set = (0x1002 | ((status &0xf ) <<2 ));/* immediate ack & 64 buffer size */ + BA_para_set = + (0x1002 | + ((status &0xf ) + <<2 ));/* immediate ack & 64 buffer size */ } le_tmp =cpu_to_le16 (BA_para_set); - pframe =rtw_set_fixed_ie (pframe,2 , (unsigned char *)(&(le_tmp)), &(pattrib->pktlen)); + pframe =rtw_set_fixed_ie (pframe,2 , + (unsigned char *)(&(le_tmp)), + &(pattrib->pktlen)); - BA_timeout_value =5000 ;/* 5ms */ + BA_timeout_value =5000 ;/* 5ms */ le_tmp =cpu_to_le16 (BA_timeout_value); - pframe =rtw_set_fixed_ie (pframe,2 , (unsigned char *)(&(le_tmp)), &(pattrib->pktlen)); + pframe =rtw_set_fixed_ie (pframe,2 , + (unsigned char *)(&(le_tmp)), + &(pattrib->pktlen));/* if ((psta = rtw_get_stainfo(pstapriv, pmlmeinfo->network.mac_address)) != NULL) */ psta =rtw_get_stainfo (pstapriv, raddr);if (psta) { - start_seq = (psta->sta_xmitpriv.txseq_tid[status &0x07 ] %4096u ) +1 ; + start_seq = (psta->sta_xmitpriv + .txseq_tid[status &0x07 ] % +4096u ) + +1 ; - psta->BA_starting_seqctrl[status &0x07 ] = start_seq; + psta->BA_starting_seqctrl[status &0x07 ] = + start_seq; BA_starting_seqctrl = start_seq <<4 ; } le_tmp =cpu_to_le16 (BA_starting_seqctrl); - pframe =rtw_set_fixed_ie (pframe,2 , (unsigned char *)(&(le_tmp)), &(pattrib->pktlen)); + pframe =rtw_set_fixed_ie (pframe,2 , + (unsigned char *)(&(le_tmp)), + &(pattrib->pktlen));break ;case 1 :/* ADDBA rsp */ - pframe =rtw_set_fixed_ie (pframe,1 , &(pmlmeinfo->ADDBA_req.dialog_token), &(pattrib->pktlen)); - pframe =rtw_set_fixed_ie (pframe,2 , (unsigned char *)(&status), &(pattrib->pktlen)); + pframe =rtw_set_fixed_ie ( + pframe,1 , &(pmlmeinfo->ADDBA_req.dialog_token), + &(pattrib->pktlen)); + pframe =rtw_set_fixed_ie (pframe,2 , + (unsigned char *)(&status), + &(pattrib->pktlen));if (padapter->driver_rx_ampdu_factor !=0xFF ) max_rx_ampdu_factor = - (enum ieee80211_max_ampdu_length_exp )padapter->driver_rx_ampdu_factor; + (enum ieee80211_max_ampdu_length_exp ) + padapter->driver_rx_ampdu_factor;else rtw_hal_get_def_var (padapter, -HW_VAR_MAX_RX_AMPDU_FACTOR , &max_rx_ampdu_factor); +HW_VAR_MAX_RX_AMPDU_FACTOR , + &max_rx_ampdu_factor);if (max_rx_ampdu_factor ==IEEE80211_HT_MAX_AMPDU_64K ) - BA_para_set = ((le16_to_cpu (pmlmeinfo->ADDBA_req.BA_para_set) &0x3f ) |0x1000 );/* 64 buffer size */ -else if (max_rx_ampdu_factor ==IEEE80211_HT_MAX_AMPDU_32K ) - BA_para_set = ((le16_to_cpu (pmlmeinfo->ADDBA_req.BA_para_set) &0x3f ) |0x0800 );/* 32 buffer size */ -else if (max_rx_ampdu_factor ==IEEE80211_HT_MAX_AMPDU_16K ) - BA_para_set = ((le16_to_cpu (pmlmeinfo->ADDBA_req.BA_para_set) &0x3f ) |0x0400 );/* 16 buffer size */ -else if (max_rx_ampdu_factor ==IEEE80211_HT_MAX_AMPDU_8K ) - BA_para_set = ((le16_to_cpu (pmlmeinfo->ADDBA_req.BA_para_set) &0x3f ) |0x0200 );/* 8 buffer size */ + BA_para_set = + ((le16_to_cpu (pmlmeinfo->ADDBA_req + .BA_para_set) & +0x3f ) | +0x1000 );/* 64 buffer size */ +else if (max_rx_ampdu_factor == +IEEE80211_HT_MAX_AMPDU_32K ) + BA_para_set = + ((le16_to_cpu (pmlmeinfo->ADDBA_req + .BA_para_set) & +0x3f ) | +0x0800 );/* 32 buffer size */ +else if (max_rx_ampdu_factor == +IEEE80211_HT_MAX_AMPDU_16K ) + BA_para_set = + ((le16_to_cpu (pmlmeinfo->ADDBA_req + .BA_para_set) & +0x3f ) | +0x0400 );/* 16 buffer size */ +else if (max_rx_ampdu_factor == +IEEE80211_HT_MAX_AMPDU_8K ) + BA_para_set = + ((le16_to_cpu (pmlmeinfo->ADDBA_req + .BA_para_set) & +0x3f ) | +0x0200 );/* 8 buffer size */ else - BA_para_set = ((le16_to_cpu (pmlmeinfo->ADDBA_req.BA_para_set) &0x3f ) |0x1000 );/* 64 buffer size */ + BA_para_set = + ((le16_to_cpu (pmlmeinfo->ADDBA_req + .BA_para_set) & +0x3f ) | +0x1000 );/* 64 buffer size */ if (hal_btcoex_IsBTCoexCtrlAMPDUSize (padapter) && padapter->driver_rx_ampdu_factor ==0xFF ) {/* max buffer size is 8 MSDU */ - BA_para_set &= ~IEEE80211_ADDBA_PARAM_BUF_SIZE_MASK ; - BA_para_set |= (8 <<6 ) &IEEE80211_ADDBA_PARAM_BUF_SIZE_MASK ; + BA_para_set &= + ~IEEE80211_ADDBA_PARAM_BUF_SIZE_MASK ; + BA_para_set |= + (8 <<6 ) & +IEEE80211_ADDBA_PARAM_BUF_SIZE_MASK ; } -if (pregpriv->ampdu_amsdu ==0 )/* disabled */ +if (pregpriv->ampdu_amsdu ==0 )/* disabled */ le_tmp =cpu_to_le16 (BA_para_set & ~BIT (0 )); -else if (pregpriv->ampdu_amsdu ==1 )/* enabled */ +else if (pregpriv->ampdu_amsdu ==1 )/* enabled */ le_tmp =cpu_to_le16 (BA_para_set |BIT (0 ));else /* auto */ le_tmp =cpu_to_le16 (BA_para_set); - pframe =rtw_set_fixed_ie (pframe,2 , (unsigned char *)(&(le_tmp)), &(pattrib->pktlen)); - pframe =rtw_set_fixed_ie (pframe,2 , (unsigned char *)(&(pmlmeinfo->ADDBA_req.BA_timeout_value)), &(pattrib->pktlen)); + pframe =rtw_set_fixed_ie (pframe,2 , + (unsigned char *)(&(le_tmp)), + &(pattrib->pktlen)); + pframe =rtw_set_fixed_ie ( + pframe,2 , + (unsigned char *)(&( + pmlmeinfo->ADDBA_req.BA_timeout_value)), + &(pattrib->pktlen));break ; -case 2 :/* DELBA */ +case 2 :/* DELBA */ BA_para_set = (status &0x1F ) <<3 ; le_tmp =cpu_to_le16 (BA_para_set); - pframe =rtw_set_fixed_ie (pframe,2 , (unsigned char *)(&(le_tmp)), &(pattrib->pktlen)); + pframe =rtw_set_fixed_ie (pframe,2 , + (unsigned char *)(&(le_tmp)), + &(pattrib->pktlen)); reason_code =37 ; le_tmp =cpu_to_le16 (reason_code); - pframe =rtw_set_fixed_ie (pframe,2 , (unsigned char *)(&(le_tmp)), &(pattrib->pktlen)); + pframe =rtw_set_fixed_ie (pframe,2 , + (unsigned char *)(&(le_tmp)), + &(pattrib->pktlen));break ;default :break ;
@@ -3482,23 +3850,24 @@ void issue_action_BA(struct adapter *padapter, unsigned char *raddr, unsigned chstatic void issue_action_BSSCoexistPacket (struct adapter *padapter) { -struct list_head *plist, *phead; +struct list_head *plist, *phead;unsigned char category, action; -struct xmit_frame *pmgntframe; -struct pkt_attrib *pattrib; +struct xmit_frame *pmgntframe; +struct pkt_attrib *pattrib;unsigned char *pframe; -struct ieee80211_hdr *pwlanhdr; +struct ieee80211_hdr *pwlanhdr;__le16 *fctrl; -struct wlan_network *pnetwork =NULL ; +struct wlan_network *pnetwork =NULL ;struct xmit_priv *pxmitpriv = &(padapter->xmitpriv);struct mlme_priv *pmlmepriv = &padapter->mlmepriv;struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info; -struct __queue *queue = &(pmlmepriv->scanned_queue); -u8 InfoContent[16 ] = {0 }; +struct __queue *queue = &(pmlmepriv->scanned_queue); +u8 InfoContent[16 ] = {0 };u8 ICS [8 ][15 ]; -if ((pmlmepriv->num_FortyMHzIntolerant ==0 ) || (pmlmepriv->num_sta_no_ht ==0 )) +if ((pmlmepriv->num_FortyMHzIntolerant ==0 ) || + (pmlmepriv->num_sta_no_ht ==0 ))return ;if (true == pmlmeinfo->bwmode_updated)
@@ -3541,9 +3910,10 @@ static void issue_action_BSSCoexistPacket(struct adapter *padapter)if (pmlmepriv->num_FortyMHzIntolerant >0 ) {u8 iedata =0 ; - iedata |=BIT (2 );/* 20 MHz BSS Width Request */ + iedata |=BIT (2 );/* 20 MHz BSS Width Request */ - pframe =rtw_set_ie (pframe,WLAN_EID_BSS_COEX_2040 ,1 , &iedata, &(pattrib->pktlen)); + pframe =rtw_set_ie (pframe,WLAN_EID_BSS_COEX_2040 ,1 , &iedata, + &(pattrib->pktlen)); }/* */
@@ -3564,19 +3934,25 @@ static void issue_action_BSSCoexistPacket(struct adapter *padapter)if (phead == plist)break ; - pnetwork = container_of(plist, struct wlan_network, list); + pnetwork = + container_of(plist, struct wlan_network, list); plist =get_next (plist); - pbss_network = (struct wlan_bssid_ex *)&pnetwork->network; + pbss_network = + (struct wlan_bssid_ex *)&pnetwork->network; - p =rtw_get_ie (pbss_network->ies + _FIXED_IE_LENGTH_,WLAN_EID_HT_CAPABILITY , &len, pbss_network->ie_length - _FIXED_IE_LENGTH_); -if (!p || len ==0 ) {/* non-HT */ + p =rtw_get_ie (pbss_network->ies + _FIXED_IE_LENGTH_, +WLAN_EID_HT_CAPABILITY , &len, + pbss_network->ie_length - + _FIXED_IE_LENGTH_); +if (!p || len ==0 ) {/* non-HT */ if (pbss_network->configuration.ds_config <=0 )continue ; -ICS [0 ][pbss_network->configuration.ds_config] =1 ; +ICS [0 ][pbss_network->configuration.ds_config] = +1 ;if (ICS [0 ][0 ] ==0 )ICS [0 ][0 ] =1 ;
@@ -3606,7 +3982,9 @@ static void issue_action_BSSCoexistPacket(struct adapter *padapter) } } - pframe =rtw_set_ie (pframe,WLAN_EID_BSS_INTOLERANT_CHL_REPORT , k, InfoContent, &(pattrib->pktlen)); + pframe =rtw_set_ie (pframe, +WLAN_EID_BSS_INTOLERANT_CHL_REPORT , + k, InfoContent, &(pattrib->pktlen)); } }
@@ -3624,7 +4002,7 @@ unsigned int send_delba(struct adapter *padapter, u8 initiator, u8 *addr)struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;u16 tid; -if ((pmlmeinfo->state&0x03 ) !=WIFI_FW_AP_STATE ) +if ((pmlmeinfo->state &0x03 ) !=WIFI_FW_AP_STATE )if (!(pmlmeinfo->state &WIFI_FW_ASSOC_SUCCESS ))return _SUCCESS;
@@ -3632,18 +4010,23 @@ unsigned int send_delba(struct adapter *padapter, u8 initiator, u8 *addr)if (!psta)return _SUCCESS; -if (initiator ==0 ) {/* recipient */ +if (initiator ==0 ) {/* recipient */ for (tid =0 ; tid <MAXTID ; tid++) {if (psta->recvreorder_ctrl[tid].enable) { -issue_action_BA (padapter, addr,WLAN_ACTION_DELBA , (((tid <<1 ) | initiator)&0x1F )); +issue_action_BA ( + padapter, addr,WLAN_ACTION_DELBA , + (((tid <<1 ) | initiator) &0x1F )); psta->recvreorder_ctrl[tid].enable = false; - psta->recvreorder_ctrl[tid].indicate_seq =0xffff ; + psta->recvreorder_ctrl[tid].indicate_seq = +0xffff ; } } - }else if (initiator ==1 ) {/* originator */ + }else if (initiator ==1 ) {/* originator */ for (tid =0 ; tid <MAXTID ; tid++) {if (psta->htpriv.agg_enable_bitmap &BIT (tid)) { -issue_action_BA (padapter, addr,WLAN_ACTION_DELBA , (((tid <<1 ) | initiator)&0x1F )); +issue_action_BA ( + padapter, addr,WLAN_ACTION_DELBA , + (((tid <<1 ) | initiator) &0x1F )); psta->htpriv.agg_enable_bitmap &= ~BIT (tid); psta->htpriv.candidate_tid_bitmap &= ~BIT (tid); }
@@ -3656,7 +4039,7 @@ unsigned int send_delba(struct adapter *padapter, u8 initiator, u8 *addr)unsigned int send_beacon (struct adapter *padapter) {u8 bxmitok = false; -int issue =0 ; +int issue =0 ;int poll =0 ;rtw_hal_set_hwreg (padapter,HW_VAR_BCN_VALID ,NULL );
@@ -3666,11 +4049,15 @@ unsigned int send_beacon(struct adapter *padapter) issue++;do {cond_resched (); -rtw_hal_get_hwreg (padapter,HW_VAR_BCN_VALID , (u8 *)(&bxmitok)); +rtw_hal_get_hwreg (padapter,HW_VAR_BCN_VALID , + (u8 *)(&bxmitok)); poll++; - }while ((poll%10 ) !=0 && false == bxmitok && !padapter->bSurpriseRemoved && !padapter->bDriverStopped); + }while ((poll %10 ) !=0 && false == bxmitok && + !padapter->bSurpriseRemoved && + !padapter->bDriverStopped); - }while (false == bxmitok && issue <100 && !padapter->bSurpriseRemoved && !padapter->bDriverStopped); + }while (false == bxmitok && issue <100 && + !padapter->bSurpriseRemoved && !padapter->bDriverStopped);if (padapter->bSurpriseRemoved || padapter->bDriverStopped)return _FAIL;
@@ -3686,7 +4073,7 @@ unsigned int send_beacon(struct adapter *padapter)void site_survey (struct adapter *padapter) {unsigned char survey_channel =0 , val8; -enum rt_scan_type ScanType =SCAN_PASSIVE ; +enum rt_scan_type ScanType =SCAN_PASSIVE ;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;u32 initialgain =0 ;
@@ -3695,43 +4082,67 @@ void site_survey(struct adapter *padapter) {struct rtw_ieee80211_channel *ch; -if (pmlmeext->sitesurvey_res.channel_idx < pmlmeext->sitesurvey_res.ch_num) { - ch = &pmlmeext->sitesurvey_res.ch[pmlmeext->sitesurvey_res.channel_idx]; +if (pmlmeext->sitesurvey_res.channel_idx < + pmlmeext->sitesurvey_res.ch_num) { + ch = &pmlmeext->sitesurvey_res + .ch[pmlmeext->sitesurvey_res.channel_idx]; survey_channel = ch->hw_value; - ScanType = (ch->flags &RTW_IEEE80211_CHAN_PASSIVE_SCAN ) ?SCAN_PASSIVE :SCAN_ACTIVE ; + ScanType = + (ch->flags &RTW_IEEE80211_CHAN_PASSIVE_SCAN ) ? +SCAN_PASSIVE : +SCAN_ACTIVE ; } }if (survey_channel !=0 ) {if (pmlmeext->sitesurvey_res.channel_idx ==0 )set_channel_bwmode (padapter, survey_channel, -HAL_PRIME_CHNL_OFFSET_DONT_CARE ,CHANNEL_WIDTH_20 ); +HAL_PRIME_CHNL_OFFSET_DONT_CARE , +CHANNEL_WIDTH_20 );else r8723bs_select_channel (padapter, survey_channel); -if (ScanType ==SCAN_ACTIVE ) {/* obey the channel plan setting... */ +if (ScanType == +SCAN_ACTIVE ) {/* obey the channel plan setting... */ {int i;for (i =0 ; i <RTW_SSID_SCAN_AMOUNT ; i++) {
Lines of this file are not shown. View the raw message.
drivers/staging/rtl8723bs/include/drv_types.h +93 -92
185 lines not on this page · raw message
drivers/staging/rtl8723bs/os_dep/os_intfs.c +85 -64
149 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.54.0
Part of the diff is not shown here. View the raw message.
Greg KH
maintainerQuoted 3 lines · pastraman
Rename bLinkInfoDump to
link_info_dumpto follow the kernel coding style, which discourages CamelCase and Hungarian notation. Issue reported by checkpatch.pl.
This does not describe what you did in this patch :(