|
@@ -4009,7 +4009,7 @@ static void init_channel_list(struct adapter *padapter,
|
|
|
continue;
|
|
|
|
|
|
if ((0 == (padapter->registrypriv.cbw40_enable & BIT(1))) &&
|
|
|
- ((BW40MINUS == o->bw) || (BW40PLUS == o->bw)))
|
|
|
+ ((o->bw == BW40MINUS) || (o->bw == BW40PLUS)))
|
|
|
continue;
|
|
|
|
|
|
if (reg == NULL) {
|
|
@@ -4041,7 +4041,7 @@ static u8 init_channel_set(struct adapter *padapter, u8 ChannelPlan,
|
|
|
|
|
|
if (padapter->registrypriv.wireless_mode & WIRELESS_11G) {
|
|
|
b2_4GBand = true;
|
|
|
- if (RT_CHANNEL_DOMAIN_REALTEK_DEFINE == ChannelPlan)
|
|
|
+ if (ChannelPlan == RT_CHANNEL_DOMAIN_REALTEK_DEFINE)
|
|
|
Index2G = RTW_CHANNEL_PLAN_MAP_REALTEK_DEFINE.Index2G;
|
|
|
else
|
|
|
Index2G = RTW_ChannelPlanMap[ChannelPlan].Index2G;
|
|
@@ -4051,14 +4051,14 @@ static u8 init_channel_set(struct adapter *padapter, u8 ChannelPlan,
|
|
|
for (index = 0; index < RTW_ChannelPlan2G[Index2G].Len; index++) {
|
|
|
channel_set[chanset_size].ChannelNum = RTW_ChannelPlan2G[Index2G].Channel[index];
|
|
|
|
|
|
- if ((RT_CHANNEL_DOMAIN_GLOBAL_DOAMIN == ChannelPlan) ||/* Channel 1~11 is active, and 12~14 is passive */
|
|
|
- (RT_CHANNEL_DOMAIN_GLOBAL_DOAMIN_2G == ChannelPlan)) {
|
|
|
+ if ((ChannelPlan == RT_CHANNEL_DOMAIN_GLOBAL_DOAMIN) ||/* Channel 1~11 is active, and 12~14 is passive */
|
|
|
+ (ChannelPlan == RT_CHANNEL_DOMAIN_GLOBAL_DOAMIN_2G)) {
|
|
|
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 (RT_CHANNEL_DOMAIN_WORLD_WIDE_13 == ChannelPlan ||
|
|
|
- RT_CHANNEL_DOMAIN_2G_WORLD == Index2G) {/* channel 12~13, passive scan */
|
|
|
+ } 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;
|
|
|
else
|
|
@@ -4782,7 +4782,7 @@ void linked_status_chk(struct adapter *padapter)
|
|
|
if (pmlmeinfo->FW_sta_info[i].status == 1) {
|
|
|
psta = pmlmeinfo->FW_sta_info[i].psta;
|
|
|
|
|
|
- if (NULL == psta)
|
|
|
+ if (psta == NULL)
|
|
|
continue;
|
|
|
if (pmlmeinfo->FW_sta_info[i].rx_pkt == sta_rx_pkts(psta)) {
|
|
|
if (pmlmeinfo->FW_sta_info[i].retry < 3) {
|