From nobody Sun Oct 5 03:40:32 2025 Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 182D2274B44 for ; Sat, 9 Aug 2025 18:28:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754764129; cv=none; b=gVvM4oOkcuw6atMVXIENpXEIOVmTslGC38ja27dzwHV9goQA3Ssg0GglW+pJoQUqoLDLFW3FGCP1TJ6p0RtOJPgJGldHYPrji3/8qwC6djpBg2TsrBR5Fl1o2rLtrGYBAB32BcKiWtvf4FAj8bH/wqtRhhbl1ahFRRMqRk0RF40= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754764129; c=relaxed/simple; bh=9PEtG/Psci1tYSfspyNDmDMtnDTZnF4RboiIIct9Rz0=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=uXuQKitp9qHZUap3aowwBzMw457F5TeRnzb8758efvA2OVEmaGiac8pOw/Ma4smX8DkYS4BjcqMLK5mTs2CTkCMMrZkR04KwmTpGvb7yqvDHpyIsV+WgJmbebZBL1j2XcWeHdY0Xxayr0+vGoLcf+Fhz3uvTfdSWWeyHvxnuDkg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=PwXsMmW0; arc=none smtp.client-ip=209.85.214.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="PwXsMmW0" Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-24014cd385bso34144155ad.0 for ; Sat, 09 Aug 2025 11:28:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1754764125; x=1755368925; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=kL7MRT7BLpIOWqHaWwyzt13Zo1sT/oCLrcjLEKGBbps=; b=PwXsMmW0Ilm6hRn1uesZUWaYslZp1I/VF+SuTD4B+aOyLu48friI9OTwzPnyyLNjDa 2sDv5eQD0wbBDZfq9+YQfX/MKtwRsogvCJRGNKeWBlmlYJJb0ROc/AHWlJxgASVBlD70 YD4blmQPlsJCFsDRZ9QoWge9m6O736pVSYKAB5fVRIlWPE5ta51kLZyjaQnVcaopViVG oCVdt3X/T4cBQFV8yQrtNJ7ZLIKhTRK6CHruyzNxfZd/Wrc2QwXGnv81nt6r5a8QYxvJ J6YfloZ6WbRI66xch7Xrq6HzjOqA/bniLmbw7ScI6PZCa2Ha8aCrQKyKfO79jf8P/hRO 5Qrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754764125; x=1755368925; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=kL7MRT7BLpIOWqHaWwyzt13Zo1sT/oCLrcjLEKGBbps=; b=k8Absy+pnh0u7py99Ru//c9D4PsvW1pVEyip50MtTbnaOQ2/VZeQYCTkwoxuxXpWUn P8pw1nJ6qoaRwANAi4sKdi1wSvlzPG2rj+4Hj4T/8nZ39kDZNssxuUUrA5x2kcTu6u6L 6p+IDROF9N3jdxsOq/4oyIAcZAE1mV47LqP6iQHaI/7bvnghM7f+JCR1oPeVpy+eQPSc Aiw72ahIz6ZxmiSBZQFa91k/+2bMLhBCqViJv7RmKA3qkDkWTLCnDaJSabma/0ttHs11 Shv5Dbhpa/r4uGEw45U16NcsCrEBHy2K1w3YsXEGuP1Rei1lHBIgk8OIYM8+hdpYquRP P+cg== X-Forwarded-Encrypted: i=1; AJvYcCXoXDg9SKUX92Vfv4CYOYDxG5BnkQMbi1Fw2Hhzlx5kWSscQ3WnpNPEJqBk552SY5HYSIRVpbHnKYTa008=@vger.kernel.org X-Gm-Message-State: AOJu0YxNDu5vebadbJLVEgZervl1ldHh0JSlXiqrXKtPTfuVbhV+3Fi/ IQxVDSLp/IsS9f4Zgp8n9Ujy80CjUCus9NqyzY5UQn8o3wbzu1YadUG2 X-Gm-Gg: ASbGncvwTzqyTK9jQ4d7FcbzKNSgVmTeiEQX6Y9H+vCZM90qMtBvfCtquskNWuOJu5A /fAyio/ig9BI0lfMuxx14PY6v12K+ayhw9+LqhIAEILwkYdkr2iA8TNKf25JI5PoCdYRSfzA4Um drUU0hyOLHixjkza2w6Vm4eNUSJenGPtYbVkfc/7+qrE0moeRejjZS5nBiSXzUKiztiejPg0yiW G9YXPEkfatHR+RWcad6vHWf3JrL1nDiHIQukf+D6rgeI9vBGecLB4jLxbYPsC/hyGlxD+x942LQ 8r352UI7zfs4zsVLSqcnj3W1UjWfKECfbgQiHMLnIX+epqlN5aoRE7HY92/l1SQDAYwWSHzjUzl YJkL+f1PuMp/fgcQjSMM6trwi5m2HwJ2w60s4fVsuaidFCe3/zPkFbum1bsPnL+yVgLc+4OdVvg hHAFQgZg+UiJHCvOXcbEROvjzfx4Hds0+e6YCN7SD/qpnyN9bvLVE= X-Google-Smtp-Source: AGHT+IFRYl5KFwZGW8tpfg44Pwi5SobmSMbup51DgXUUtAG/O8NLByUERR6xpH1DEMdkTeJrkaFgpw== X-Received: by 2002:a17:902:d50b:b0:240:10dc:b795 with SMTP id d9443c01a7336-242c1fdc662mr124736085ad.1.1754764124928; Sat, 09 Aug 2025 11:28:44 -0700 (PDT) Received: from wen-HP-ProBook-445-14-inch-G9-Notebook-PC.. (36-239-105-221.dynamic-ip.hinet.net. [36.239.105.221]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-241d1ef5970sm233573365ad.20.2025.08.09.11.28.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 09 Aug 2025 11:28:44 -0700 (PDT) From: Yao-Wen Chang To: gregkh@linuxfoundation.org Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Yao-Wen-Chang Subject: [PATCH] staging: rtl8723bs: refactor code for style compliance Date: Sun, 10 Aug 2025 02:28:35 +0800 Message-ID: <20250809182835.863172-1-changyaowen19980629@gmail.com> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Yao-Wen-Chang This patch refactors the rtl8723bs staging driver to improve code style: 1. Ensure lines are within 100 characters per line for readability. 2. Add spaces around operators for consistency with kernel coding style. 3. Convert camelCase variables to snake_case for uniformity. Signed-off-by: Yao-Wen Chang --- drivers/staging/rtl8723bs/core/rtw_ap.c | 289 ++++++++++------------- drivers/staging/rtl8723bs/core/rtw_cmd.c | 165 ++++++++----- 2 files changed, 224 insertions(+), 230 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_ap.c b/drivers/staging/rtl8= 723bs/core/rtw_ap.c index b2e7e7267aa4..2c5286062a06 100644 --- a/drivers/staging/rtl8723bs/core/rtw_ap.c +++ b/drivers/staging/rtl8723bs/core/rtw_ap.c @@ -258,11 +258,9 @@ void expire_timeout_chk(struct adapter *padapter) } else { /* TODO: Aging mechanism to digest frames in sleep_q to */ /* avoid running out of xmitframe */ - if (psta->sleepq_len > (NR_XMITFRAME / pstapriv->asoc_list_cnt) - && padapter->xmitpriv.free_xmitframe_cnt < (( - NR_XMITFRAME / pstapriv->asoc_list_cnt - ) / 2) - ) + if (psta->sleepq_len > (NR_XMITFRAME / pstapriv->asoc_list_cnt) && + (padapter->xmitpriv.free_xmitframe_cnt < ((NR_XMITFRAME / + pstapriv->asoc_list_cnt) / 2))) wakeup_sta_to_xmit(padapter, psta); } } @@ -322,7 +320,7 @@ void expire_timeout_chk(struct adapter *padapter) =20 void add_RATid(struct adapter *padapter, struct sta_info *psta, u8 rssi_le= vel) { - unsigned char sta_band =3D 0, shortGIrate =3D false; + unsigned char sta_band =3D 0, short_GI_rate =3D false; unsigned int tx_ra_bitmap =3D 0; struct mlme_priv *pmlmepriv =3D &padapter->mlmepriv; struct wlan_bssid_ex @@ -337,7 +335,7 @@ void add_RATid(struct adapter *padapter, struct sta_inf= o *psta, u8 rssi_level) rtw_hal_update_sta_rate_mask(padapter, psta); tx_ra_bitmap =3D psta->ra_mask; =20 - shortGIrate =3D query_ra_short_GI(psta); + short_GI_rate =3D query_ra_short_GI(psta); =20 if (pcur_network->configuration.ds_config > 14) { sta_band |=3D WIRELESS_INVALID; @@ -360,7 +358,7 @@ void add_RATid(struct adapter *padapter, struct sta_inf= o *psta, u8 rssi_level) =20 arg[0] =3D psta->mac_id; arg[1] =3D psta->raid; - arg[2] =3D shortGIrate; + arg[2] =3D short_GI_rate; arg[3] =3D psta->init_rate; =20 rtw_hal_add_ra_tid(padapter, tx_ra_bitmap, arg, rssi_level); @@ -370,7 +368,7 @@ void add_RATid(struct adapter *padapter, struct sta_inf= o *psta, u8 rssi_level) void update_bmc_sta(struct adapter *padapter) { unsigned char network_type; - int supportRateNum =3D 0; + int support_rate_num =3D 0; unsigned int tx_ra_bitmap =3D 0; struct mlme_priv *pmlmepriv =3D &padapter->mlmepriv; struct mlme_ext_priv *pmlmeext =3D &padapter->mlmeextpriv; @@ -393,14 +391,15 @@ void update_bmc_sta(struct adapter *padapter) =20 memset((void *)&psta->sta_stats, 0, sizeof(struct stainfo_stats)); =20 - /* psta->dot118021XPrivacy =3D _NO_PRIVACY_;//!!! remove it, because it = has been set before this. */ + /* psta->dot118021XPrivacy =3D _NO_PRIVACY_; + * //!!! remove it, because it has been set before this. + */ =20 - /* prepare for add_RATid */ - supportRateNum =3D rtw_get_rateset_len((u8 *)&pcur_network->supported_ra= tes); + /* prepare for add_ra_tid */ + support_rate_num =3D rtw_get_rateset_len((u8 *)&pcur_network->supported_= rates); network_type =3D rtw_check_network_type((u8 *)&pcur_network->supported_r= ates, - supportRateNum, - pcur_network->configuration.ds_config - ); + support_rate_num, + pcur_network->configuration.ds_config); if (is_supported_tx_cck(network_type)) { network_type =3D WIRELESS_11B; } else if (network_type =3D=3D WIRELESS_INVALID) { /* error handling */ @@ -438,7 +437,6 @@ void update_bmc_sta(struct adapter *padapter) spin_lock_bh(&psta->lock); psta->state =3D _FW_LINKED; spin_unlock_bh(&psta->lock); - } } =20 @@ -482,13 +480,11 @@ void update_sta_info_apmode(struct adapter *padapter,= struct sta_info *psta) /* check if sta supports rx ampdu */ phtpriv_sta->ampdu_enable =3D phtpriv_ap->ampdu_enable; =20 - phtpriv_sta->rx_ampdu_min_spacing =3D ( - phtpriv_sta->ht_cap.ampdu_params_info & IEEE80211_HT_CAP_AMPDU_DENSITY - ) >> 2; + phtpriv_sta->rx_ampdu_min_spacing =3D (phtpriv_sta->ht_cap.ampdu_params_= info & + IEEE80211_HT_CAP_AMPDU_DENSITY) >> 2; =20 /* bwmode */ - if (( - phtpriv_sta->ht_cap.cap_info & phtpriv_ap->ht_cap.cap_info + if ((phtpriv_sta->ht_cap.cap_info & phtpriv_ap->ht_cap.cap_info ) & cpu_to_le16(IEEE80211_HT_CAP_SUP_WIDTH)) psta->bw_mode =3D CHANNEL_WIDTH_40; else @@ -500,14 +496,12 @@ void update_sta_info_apmode(struct adapter *padapter,= struct sta_info *psta) phtpriv_sta->ch_offset =3D pmlmeext->cur_ch_offset; =20 /* check if sta support s Short GI 20M */ - if (( - phtpriv_sta->ht_cap.cap_info & phtpriv_ap->ht_cap.cap_info + if ((phtpriv_sta->ht_cap.cap_info & phtpriv_ap->ht_cap.cap_info ) & cpu_to_le16(IEEE80211_HT_CAP_SGI_20)) phtpriv_sta->sgi_20m =3D true; =20 /* check if sta support s Short GI 40M */ - if (( - phtpriv_sta->ht_cap.cap_info & phtpriv_ap->ht_cap.cap_info + if ((phtpriv_sta->ht_cap.cap_info & phtpriv_ap->ht_cap.cap_info ) & cpu_to_le16(IEEE80211_HT_CAP_SGI_40)) { if (psta->bw_mode =3D=3D CHANNEL_WIDTH_40) /* according to psta->bw_mod= e */ phtpriv_sta->sgi_40m =3D true; @@ -519,12 +513,12 @@ void update_sta_info_apmode(struct adapter *padapter,= struct sta_info *psta) =20 /* B0 Config LDPC Coding Capability */ if (TEST_FLAG(phtpriv_ap->ldpc_cap, LDPC_HT_ENABLE_TX) && - GET_HT_CAPABILITY_ELE_LDPC_CAP((u8 *)(&phtpriv_sta->ht_cap))) + GET_HT_CAPABILITY_ELE_LDPC_CAP((u8 *)&phtpriv_sta->ht_cap)) SET_FLAG(cur_ldpc_cap, (LDPC_HT_ENABLE_TX | LDPC_HT_CAP_TX)); =20 /* B7 B8 B9 Config STBC setting */ if (TEST_FLAG(phtpriv_ap->stbc_cap, STBC_HT_ENABLE_TX) && - GET_HT_CAPABILITY_ELE_RX_STBC((u8 *)(&phtpriv_sta->ht_cap))) + GET_HT_CAPABILITY_ELE_RX_STBC((u8 *)&phtpriv_sta->ht_cap)) SET_FLAG(cur_stbc_cap, (STBC_HT_ENABLE_TX | STBC_HT_CAP_TX)); } else { phtpriv_sta->ampdu_enable =3D false; @@ -580,11 +574,11 @@ static void update_ap_info(struct adapter *padapter, = struct sta_info *psta) /* phtpriv_ap->ampdu_enable =3D phtpriv_ap->ampdu_enable; */ =20 /* check if sta support s Short GI 20M */ - if ((phtpriv_ap->ht_cap.cap_info) & cpu_to_le16(IEEE80211_HT_CAP_SGI_20)) + if (phtpriv_ap->ht_cap.cap_info & cpu_to_le16(IEEE80211_HT_CAP_SGI_20)) phtpriv_ap->sgi_20m =3D true; =20 /* check if sta support s Short GI 40M */ - if ((phtpriv_ap->ht_cap.cap_info) & cpu_to_le16(IEEE80211_HT_CAP_SGI_40)) + if (phtpriv_ap->ht_cap.cap_info & cpu_to_le16(IEEE80211_HT_CAP_SGI_40)) phtpriv_ap->sgi_40m =3D true; =20 psta->qos_option =3D true; @@ -627,8 +621,7 @@ static void update_hw_ht_param(struct adapter *padapter) /* */ /* Config SM Power Save setting */ /* */ - pmlmeinfo->SM_PS =3D (le16_to_cpu( - pmlmeinfo->HT_caps.u.HT_cap_element.HT_caps_info + pmlmeinfo->SM_PS =3D (le16_to_cpu(pmlmeinfo->HT_caps.u.HT_cap_element.HT_= caps_info ) & 0x0C) >> 2; =20 /* */ @@ -660,9 +653,11 @@ void start_bss_network(struct adapter *padapter) cur_bwmode =3D CHANNEL_WIDTH_20; cur_ch_offset =3D HAL_PRIME_CHNL_OFFSET_DONT_CARE; =20 - /* check if there is wps ie, */ - /* if there is wpsie in beacon, the hostapd will update beacon twice when= stating hostapd, */ - /* and at first time the security ie (RSN/WPA IE) will not include in bea= con. */ + /* check if there is wps ie, + * if there is wpsie in beacon, the hostapd will update beacon twice when= stating hostapd, + * and at first time the security ie (RSN/WPA IE) will not include in bea= con. + */ + if (!rtw_get_wps_ie(pnetwork->ies + _FIXED_IE_LENGTH_, pnetwork->ie_length - _FIXED_IE_LENGTH_, NULL, NULL)) pmlmeext->bstart_bss =3D true; @@ -784,10 +779,7 @@ void start_bss_network(struct adapter *padapter) rtw_hal_set_hwreg(padapter, HW_VAR_BASIC_RATE, pnetwork->supported_rates); =20 /* update capability after cur_wireless_mode updated */ - update_capinfo( - padapter, - rtw_get_capability((struct wlan_bssid_ex *)pnetwork) - ); + update_capinfo(padapter, rtw_get_capability((struct wlan_bssid_ex *)pnetw= ork)); =20 if (pmlmeext->bstart_bss) { update_beacon(padapter, WLAN_EID_TIM, NULL, true); @@ -806,14 +798,14 @@ int rtw_check_beacon_data(struct adapter *padapter, u= 8 *pbuf, int len) { int ret =3D _SUCCESS; u8 *p; - u8 *pHT_caps_ie =3D NULL; - u8 *pHT_info_ie =3D NULL; + u8 *p_HT_caps_ie =3D NULL; + u8 *p_HT_info_ie =3D NULL; struct sta_info *psta =3D NULL; u16 cap, ht_cap =3D false; uint ie_len =3D 0; int group_cipher, pairwise_cipher; - u8 channel, network_type, supportRate[NDIS_802_11_LENGTH_RATES_EX]; - int supportRateNum =3D 0; + u8 channel, network_type, support_rate[NDIS_802_11_LENGTH_RATES_EX]; + int support_rate_num =3D 0; u8 OUI1[] =3D {0x00, 0x50, 0xf2, 0x01}; u8 WMM_PARA_IE[] =3D {0x00, 0x50, 0xf2, 0x02, 0x01, 0x01}; struct registry_priv *pregistrypriv =3D &padapter->registrypriv; @@ -843,7 +835,9 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 = *pbuf, int len) memcpy(pbss_network->mac_address, myid(&padapter->eeprompriv), ETH_ALEN); =20 /* beacon interval */ - p =3D rtw_get_beacon_interval_from_ie(ie);/* ie + 8; 8: TimeStamp, 2: Bea= con Interval 2:Capability */ + p =3D rtw_get_beacon_interval_from_ie(ie); /* ie + 8; 8: + *TimeStamp, 2: Beacon Interval 2:Capability + */ /* pbss_network->configuration.beacon_period =3D le16_to_cpu(*(unsigned s= hort*)p); */ pbss_network->configuration.beacon_period =3D get_unaligned_le16(p); =20 @@ -853,12 +847,11 @@ int rtw_check_beacon_data(struct adapter *padapter, u= 8 *pbuf, int len) cap =3D get_unaligned_le16(ie); =20 /* SSID */ - p =3D rtw_get_ie( - ie + _BEACON_IE_OFFSET_, + p =3D rtw_get_ie(ie + _BEACON_IE_OFFSET_,=20 WLAN_EID_SSID, &ie_len, - (pbss_network->ie_length - _BEACON_IE_OFFSET_) - ); + pbss_network->ie_length - _BEACON_IE_OFFSET_); + if (p && ie_len > 0) { memset(&pbss_network->ssid, 0, sizeof(struct ndis_802_11_ssid)); memcpy(pbss_network->ssid.ssid, (p + 2), ie_len); @@ -868,52 +861,45 @@ int rtw_check_beacon_data(struct adapter *padapter, u= 8 *pbuf, int len) /* channel */ channel =3D 0; pbss_network->configuration.length =3D 0; - p =3D rtw_get_ie( - ie + _BEACON_IE_OFFSET_, - WLAN_EID_DS_PARAMS, &ie_len, - (pbss_network->ie_length - _BEACON_IE_OFFSET_) - ); + p =3D rtw_get_ie(ie + _BEACON_IE_OFFSET_,=20 + WLAN_EID_DS_PARAMS, + &ie_len,=20 + (pbss_network->ie_length - _BEACON_IE_OFFSET_)); if (p && ie_len > 0) channel =3D *(p + 2); =20 pbss_network->configuration.ds_config =3D channel; =20 - memset(supportRate, 0, NDIS_802_11_LENGTH_RATES_EX); + memset(support_rate, 0, NDIS_802_11_LENGTH_RATES_EX); /* get supported rates */ - p =3D rtw_get_ie( - ie + _BEACON_IE_OFFSET_, + p =3D rtw_get_ie(ie + _BEACON_IE_OFFSET_,=20 WLAN_EID_SUPP_RATES, &ie_len, - (pbss_network->ie_length - _BEACON_IE_OFFSET_) - ); + (pbss_network->ie_length - _BEACON_IE_OFFSET_)); if (p) { - memcpy(supportRate, p + 2, ie_len); - supportRateNum =3D ie_len; + memcpy(support_rate, p + 2, ie_len); + support_rate_num =3D ie_len; } =20 /* get ext_supported rates */ - p =3D rtw_get_ie( - ie + _BEACON_IE_OFFSET_, + p =3D rtw_get_ie(ie + _BEACON_IE_OFFSET_,=20 WLAN_EID_EXT_SUPP_RATES, &ie_len, - pbss_network->ie_length - _BEACON_IE_OFFSET_ - ); + pbss_network->ie_length - _BEACON_IE_OFFSET_); if (p) { - memcpy(supportRate + supportRateNum, p + 2, ie_len); - supportRateNum +=3D ie_len; + memcpy(support_rate + support_rate_num, p + 2, ie_len); + support_rate_num +=3D ie_len; } =20 - network_type =3D rtw_check_network_type(supportRate, supportRateNum, chan= nel); + network_type =3D rtw_check_network_type(support_rate, support_rate_num, c= hannel); =20 rtw_set_supported_rate(pbss_network->supported_rates, network_type); =20 /* parsing ERP_IE */ - p =3D rtw_get_ie( - ie + _BEACON_IE_OFFSET_, + p =3D rtw_get_ie(ie + _BEACON_IE_OFFSET_,=20 WLAN_EID_ERP_INFO, &ie_len, - (pbss_network->ie_length - _BEACON_IE_OFFSET_) - ); + (pbss_network->ie_length - _BEACON_IE_OFFSET_)); if (p && ie_len > 0) ERP_IE_handler(padapter, (struct ndis_80211_var_ie *)p); =20 @@ -929,15 +915,12 @@ int rtw_check_beacon_data(struct adapter *padapter, u= 8 *pbuf, int len) group_cipher =3D 0; pairwise_cipher =3D 0; psecuritypriv->wpa2_group_cipher =3D _NO_PRIVACY_; psecuritypriv->wpa2_pairwise_cipher =3D _NO_PRIVACY_; - p =3D rtw_get_ie( - ie + _BEACON_IE_OFFSET_, + p =3D rtw_get_ie(ie + _BEACON_IE_OFFSET_,=20 WLAN_EID_RSN, &ie_len, - (pbss_network->ie_length - _BEACON_IE_OFFSET_) - ); + (pbss_network->ie_length - _BEACON_IE_OFFSET_)); if (p && ie_len > 0) { - if (rtw_parse_wpa2_ie( - p, + if (rtw_parse_wpa2_ie(p, ie_len + 2, &group_cipher, &pairwise_cipher, @@ -959,15 +942,12 @@ int rtw_check_beacon_data(struct adapter *padapter, u= 8 *pbuf, int len) psecuritypriv->wpa_group_cipher =3D _NO_PRIVACY_; psecuritypriv->wpa_pairwise_cipher =3D _NO_PRIVACY_; for (p =3D ie + _BEACON_IE_OFFSET_; ; p +=3D (ie_len + 2)) { - p =3D rtw_get_ie( - p, + p =3D rtw_get_ie(p,=20 WLAN_EID_VENDOR_SPECIFIC, &ie_len, - (pbss_network->ie_length - _BEACON_IE_OFFSET_ - (ie_len + 2)) - ); + (pbss_network->ie_length - _BEACON_IE_OFFSET_ - (ie_len + 2))); if ((p) && (!memcmp(p + 2, OUI1, 4))) { - if (rtw_parse_wpa_ie( - p, + if (rtw_parse_wpa_ie(p, ie_len + 2, &group_cipher, &pairwise_cipher, @@ -995,8 +975,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 = *pbuf, int len) pmlmepriv->qospriv.qos_option =3D 0; if (pregistrypriv->wmm_enable) { for (p =3D ie + _BEACON_IE_OFFSET_; ; p +=3D (ie_len + 2)) { - p =3D rtw_get_ie( - p, + p =3D rtw_get_ie(p,=20 WLAN_EID_VENDOR_SPECIFIC, &ie_len, (pbss_network->ie_length - _BEACON_IE_OFFSET_ - (ie_len + 2)) @@ -1022,27 +1001,25 @@ int rtw_check_beacon_data(struct adapter *padapter,= u8 *pbuf, int len) } =20 /* parsing HT_CAP_IE */ - p =3D rtw_get_ie( - ie + _BEACON_IE_OFFSET_, + p =3D rtw_get_ie(ie + _BEACON_IE_OFFSET_,=20 WLAN_EID_HT_CAPABILITY, &ie_len, - (pbss_network->ie_length - _BEACON_IE_OFFSET_) - ); + (pbss_network->ie_length - _BEACON_IE_OFFSET_)); if (p && ie_len > 0) { u8 max_rx_ampdu_factor =3D 0; struct ieee80211_ht_cap *pht_cap =3D (struct ieee80211_ht_cap *)(p + 2); =20 - pHT_caps_ie =3D p; + p_HT_caps_ie =3D p; =20 ht_cap =3D true; network_type |=3D WIRELESS_11_24N; =20 rtw_ht_use_default_setting(padapter); =20 - if (pmlmepriv->htpriv.sgi_20m =3D=3D false) + if (!pmlmepriv->htpriv.sgi_20m) pht_cap->cap_info &=3D cpu_to_le16(~(IEEE80211_HT_CAP_SGI_20)); =20 - if (pmlmepriv->htpriv.sgi_40m =3D=3D false) + if (!pmlmepriv->htpriv.sgi_40m) pht_cap->cap_info &=3D cpu_to_le16(~(IEEE80211_HT_CAP_SGI_40)); =20 if (!TEST_FLAG(pmlmepriv->htpriv.ldpc_cap, LDPC_HT_ENABLE_RX)) @@ -1054,9 +1031,8 @@ int rtw_check_beacon_data(struct adapter *padapter, u= 8 *pbuf, int len) if (!TEST_FLAG(pmlmepriv->htpriv.stbc_cap, STBC_HT_ENABLE_RX)) pht_cap->cap_info &=3D cpu_to_le16(~(IEEE80211_HT_CAP_RX_STBC_3R)); =20 - pht_cap->ampdu_params_info &=3D ~( - IEEE80211_HT_CAP_AMPDU_FACTOR | IEEE80211_HT_CAP_AMPDU_DENSITY - ); + pht_cap->ampdu_params_info &=3D ~(IEEE80211_HT_CAP_AMPDU_FACTOR | + IEEE80211_HT_CAP_AMPDU_DENSITY); =20 if ((psecuritypriv->wpa_pairwise_cipher & WPA_CIPHER_CCMP) || (psecuritypriv->wpa2_pairwise_cipher & WPA_CIPHER_CCMP)) { @@ -1067,13 +1043,12 @@ int rtw_check_beacon_data(struct adapter *padapter,= u8 *pbuf, int len) 0x00); } =20 - rtw_hal_get_def_var( - padapter, + rtw_hal_get_def_var(padapter,=20 HW_VAR_MAX_RX_AMPDU_FACTOR, &max_rx_ampdu_factor ); - pht_cap->ampdu_params_info |=3D ( - IEEE80211_HT_CAP_AMPDU_FACTOR & max_rx_ampdu_factor + pht_cap->ampdu_params_info |=3D + (IEEE80211_HT_CAP_AMPDU_FACTOR & max_rx_ampdu_factor ); /* set Max Rx AMPDU size to 64K */ =20 pht_cap->mcs.rx_mask[0] =3D 0xff; @@ -1083,14 +1058,12 @@ int rtw_check_beacon_data(struct adapter *padapter,= u8 *pbuf, int len) } =20 /* parsing HT_INFO_IE */ - p =3D rtw_get_ie( - ie + _BEACON_IE_OFFSET_, + p =3D rtw_get_ie(ie + _BEACON_IE_OFFSET_,=20 WLAN_EID_HT_OPERATION, &ie_len, - (pbss_network->ie_length - _BEACON_IE_OFFSET_) - ); + (pbss_network->ie_length - _BEACON_IE_OFFSET_)); if (p && ie_len > 0) - pHT_info_ie =3D p; + p_HT_info_ie =3D p; =20 switch (network_type) { case WIRELESS_11B: @@ -1125,14 +1098,12 @@ int rtw_check_beacon_data(struct adapter *padapter,= u8 *pbuf, int len) if (pregistrypriv->ampdu_enable =3D=3D 1) pmlmepriv->htpriv.ampdu_enable =3D true; =20 - HT_caps_handler(padapter, (struct ndis_80211_var_ie *)pHT_caps_ie); + HT_caps_handler(padapter, (struct ndis_80211_var_ie *)p_HT_caps_ie); =20 - HT_info_handler(padapter, (struct ndis_80211_var_ie *)pHT_info_ie); + HT_info_handler(padapter, (struct ndis_80211_var_ie *)p_HT_info_ie); } =20 - pbss_network->length =3D get_wlan_bssid_ex_sz( - (struct wlan_bssid_ex *)pbss_network - ); + pbss_network->length =3D get_wlan_bssid_ex_sz((struct wlan_bssid_ex *)pb= ss_network); =20 /* issue beacon to start bss network */ /* start_bss_network(padapter, (u8 *)pbss_network); */ @@ -1149,7 +1120,9 @@ int rtw_check_beacon_data(struct adapter *padapter, u= 8 *pbuf, int len) /* update AP's sta info */ update_ap_info(padapter, psta); =20 - psta->state |=3D WIFI_AP_STATE; /* Aries, add, fix bug of flush_cam_entr= y at STOP AP mode , 0724 */ + psta->state |=3D WIFI_AP_STATE; /* Aries, add, fix bug of flush_cam_entry + * at STOP AP mode , 0724 + */ rtw_indicate_connect(padapter); =20 pmlmepriv->cur_network.join_res =3D true;/* for check if already set beac= on */ @@ -1188,7 +1161,7 @@ int rtw_acl_add_sta(struct adapter *padapter, u8 *add= r) paclnode =3D list_entry(plist, struct rtw_wlan_acl_node, list); =20 if (!memcmp(paclnode->addr, addr, ETH_ALEN)) { - if (paclnode->valid =3D=3D true) { + if (paclnode->valid) { added =3D true; break; } @@ -1239,8 +1212,7 @@ void rtw_acl_remove_sta(struct adapter *padapter, u8 = *addr) list_for_each_safe(plist, tmp, phead) { paclnode =3D list_entry(plist, struct rtw_wlan_acl_node, list); =20 - if ( - !memcmp(paclnode->addr, addr, ETH_ALEN) || + if (!memcmp(paclnode->addr, addr, ETH_ALEN) || is_broadcast_ether_addr(addr) ) { if (paclnode->valid) { @@ -1254,7 +1226,6 @@ void rtw_acl_remove_sta(struct adapter *padapter, u8 = *addr) } =20 spin_unlock_bh(&pacl_node_q->lock); - } =20 u8 rtw_ap_set_pairwise_key(struct adapter *padapter, struct sta_info *psta) @@ -1292,13 +1263,11 @@ u8 rtw_ap_set_pairwise_key(struct adapter *padapter= , struct sta_info *psta) return res; } =20 -static int rtw_ap_set_key( - struct adapter *padapter, +static int rtw_ap_set_key(struct adapter *padapter,=20 u8 *key, u8 alg, int keyid, - u8 set_tx -) + u8 set_tx) { u8 keylen; struct cmd_obj *pcmd; @@ -1362,13 +1331,11 @@ int rtw_ap_set_group_key(struct adapter *padapter, = u8 *key, u8 alg, int keyid) return rtw_ap_set_key(padapter, key, alg, keyid, 1); } =20 -int rtw_ap_set_wep_key( - struct adapter *padapter, +int rtw_ap_set_wep_key(struct adapter *padapter,=20 u8 *key, u8 keylen, int keyid, - u8 set_tx -) + u8 set_tx) { u8 alg; =20 @@ -1403,21 +1370,18 @@ static void update_bcn_erpinfo_ie(struct adapter *p= adapter) return; =20 /* parsing ERP_IE */ - p =3D rtw_get_ie( - ie + _BEACON_IE_OFFSET_, + p =3D rtw_get_ie(ie + _BEACON_IE_OFFSET_,=20 WLAN_EID_ERP_INFO, &len, - (pnetwork->ie_length - _BEACON_IE_OFFSET_) - ); + (pnetwork->ie_length - _BEACON_IE_OFFSET_)); if (p && len > 0) { struct ndis_80211_var_ie *pIE =3D (struct ndis_80211_var_ie *)p; =20 if (pmlmepriv->num_sta_non_erp =3D=3D 1) pIE->data[0] |=3D RTW_ERP_INFO_NON_ERP_PRESENT | RTW_ERP_INFO_USE_PROTE= CTION; else - pIE->data[0] &=3D ~( - RTW_ERP_INFO_NON_ERP_PRESENT | RTW_ERP_INFO_USE_PROTECTION - ); + pIE->data[0] &=3D ~(RTW_ERP_INFO_NON_ERP_PRESENT | + RTW_ERP_INFO_USE_PROTECTION); =20 if (pmlmepriv->num_sta_no_short_preamble > 0) pIE->data[0] |=3D RTW_ERP_INFO_BARKER_PREAMBLE_MODE; @@ -1463,12 +1427,10 @@ static void update_bcn_wps_ie(struct adapter *padap= ter) unsigned char *ie =3D pnetwork->ies; u32 ielen =3D pnetwork->ie_length; =20 - pwps_ie =3D rtw_get_wps_ie( - ie + _FIXED_IE_LENGTH_, + pwps_ie =3D rtw_get_wps_ie(ie + _FIXED_IE_LENGTH_, ielen - _FIXED_IE_LENGTH_, NULL, - &wps_ielen - ); + &wps_ielen); =20 if (!pwps_ie || wps_ielen =3D=3D 0) return; @@ -1492,7 +1454,7 @@ static void update_bcn_wps_ie(struct adapter *padapte= r) wps_ielen =3D (uint)pwps_ie_src[1];/* to get ie data len */ if ((wps_offset + wps_ielen + 2 + remainder_ielen) <=3D MAX_IE_SZ) { memcpy(pwps_ie, pwps_ie_src, wps_ielen + 2); - pwps_ie +=3D (wps_ielen+2); + pwps_ie +=3D (wps_ielen + 2); =20 if (pbackup_remainder_ie) memcpy(pwps_ie, pbackup_remainder_ie, remainder_ielen); @@ -1620,8 +1582,8 @@ static int rtw_ht_operation_update(struct adapter *pa= dapter) if (pmlmepriv->htpriv.ht_option) return 0; =20 - if (!(pmlmepriv->ht_op_mode & IEEE80211_HT_OP_MODE_NON_GF_STA_PRSNT) - && pmlmepriv->num_sta_ht_no_gf) { + if (!(pmlmepriv->ht_op_mode & IEEE80211_HT_OP_MODE_NON_GF_STA_PRSNT) && + pmlmepriv->num_sta_ht_no_gf) { pmlmepriv->ht_op_mode |=3D IEEE80211_HT_OP_MODE_NON_GF_STA_PRSNT; op_mode_changes++; @@ -1653,9 +1615,8 @@ static int rtw_ht_operation_update(struct adapter *pa= dapter) if (pmlmepriv->num_sta_no_ht || (pmlmepriv->ht_op_mode & IEEE80211_HT_OP_MODE_NON_GF_STA_PRSNT)) new_op_mode =3D IEEE80211_HT_OP_MODE_PROTECTION_NONHT_MIXED; - else if ( - (le16_to_cpu(phtpriv_ap->ht_cap.cap_info) & IEEE80211_HT_CAP_SUP_WIDTH) - && pmlmepriv->num_sta_ht_20mhz) + else if ((le16_to_cpu(phtpriv_ap->ht_cap.cap_info) & IEEE80211_HT_CAP_SUP= _WIDTH) && + pmlmepriv->num_sta_ht_20mhz) new_op_mode =3D IEEE80211_HT_OP_MODE_PROTECTION_20MHZ; else if (pmlmepriv->olbc_ht) new_op_mode =3D IEEE80211_HT_OP_MODE_PROTECTION_NONMEMBER; @@ -1707,8 +1668,8 @@ void bss_cap_update_on_sta_join(struct adapter *padap= ter, struct sta_info *psta) =20 pmlmepriv->num_sta_no_short_preamble++; =20 - if ((pmlmeext->cur_wireless_mode > WIRELESS_11B) && - (pmlmepriv->num_sta_no_short_preamble =3D=3D 1)) { + if (pmlmeext->cur_wireless_mode > WIRELESS_11B && + pmlmepriv->num_sta_no_short_preamble =3D=3D 1) { beacon_updated =3D true; update_beacon(padapter, 0xFF, NULL, true); } @@ -1719,8 +1680,8 @@ void bss_cap_update_on_sta_join(struct adapter *padap= ter, struct sta_info *psta) =20 pmlmepriv->num_sta_no_short_preamble--; =20 - if ((pmlmeext->cur_wireless_mode > WIRELESS_11B) && - (pmlmepriv->num_sta_no_short_preamble =3D=3D 0)) { + if (pmlmeext->cur_wireless_mode > WIRELESS_11B && + pmlmepriv->num_sta_no_short_preamble =3D=3D 0) { beacon_updated =3D true; update_beacon(padapter, 0xFF, NULL, true); } @@ -1757,8 +1718,8 @@ void bss_cap_update_on_sta_join(struct adapter *padap= ter, struct sta_info *psta) =20 pmlmepriv->num_sta_no_short_slot_time++; =20 - if ((pmlmeext->cur_wireless_mode > WIRELESS_11B) && - (pmlmepriv->num_sta_no_short_slot_time =3D=3D 1)) { + if (pmlmeext->cur_wireless_mode > WIRELESS_11B && + pmlmepriv->num_sta_no_short_slot_time =3D=3D 1) { beacon_updated =3D true; update_beacon(padapter, 0xFF, NULL, true); } @@ -1769,8 +1730,8 @@ void bss_cap_update_on_sta_join(struct adapter *padap= ter, struct sta_info *psta) =20 pmlmepriv->num_sta_no_short_slot_time--; =20 - if ((pmlmeext->cur_wireless_mode > WIRELESS_11B) && - (pmlmepriv->num_sta_no_short_slot_time =3D=3D 0)) { + if (pmlmeext->cur_wireless_mode > WIRELESS_11B && + pmlmepriv->num_sta_no_short_slot_time =3D=3D 0) { beacon_updated =3D true; update_beacon(padapter, 0xFF, NULL, true); } @@ -1827,8 +1788,8 @@ u8 bss_cap_update_on_sta_leave(struct adapter *padapt= er, struct sta_info *psta) if (psta->no_short_preamble_set) { psta->no_short_preamble_set =3D 0; pmlmepriv->num_sta_no_short_preamble--; - if (pmlmeext->cur_wireless_mode > WIRELESS_11B - && pmlmepriv->num_sta_no_short_preamble =3D=3D 0){ + if (pmlmeext->cur_wireless_mode > WIRELESS_11B && + pmlmepriv->num_sta_no_short_preamble =3D=3D 0){ beacon_updated =3D true; update_beacon(padapter, 0xFF, NULL, true); } @@ -1846,8 +1807,8 @@ u8 bss_cap_update_on_sta_leave(struct adapter *padapt= er, struct sta_info *psta) if (psta->no_short_slot_time_set) { psta->no_short_slot_time_set =3D 0; pmlmepriv->num_sta_no_short_slot_time--; - if (pmlmeext->cur_wireless_mode > WIRELESS_11B - && pmlmepriv->num_sta_no_short_slot_time =3D=3D 0){ + if (pmlmeext->cur_wireless_mode > WIRELESS_11B && + pmlmepriv->num_sta_no_short_slot_time =3D=3D 0){ beacon_updated =3D true; update_beacon(padapter, 0xFF, NULL, true); } @@ -1876,12 +1837,10 @@ u8 bss_cap_update_on_sta_leave(struct adapter *pada= pter, struct sta_info *psta) return beacon_updated; } =20 -u8 ap_free_sta( - struct adapter *padapter, +u8 ap_free_sta(struct adapter *padapter,=20 struct sta_info *psta, bool active, - u16 reason -) + u16 reason) { u8 beacon_updated =3D false; =20 @@ -1995,6 +1954,7 @@ void ap_sta_info_defer_update(struct adapter *padapte= r, struct sta_info *psta) add_RATid(padapter, psta, 0);/* DM_RATR_STA_INIT */ } } + /* restore hw setting from sw data structures */ void rtw_ap_restore_network(struct adapter *padapter) { @@ -2009,25 +1969,22 @@ void rtw_ap_restore_network(struct adapter *padapte= r) =20 rtw_setopmode_cmd(padapter, Ndis802_11APMode, false); =20 - set_channel_bwmode( - padapter, + set_channel_bwmode(padapter,=20 + =09 pmlmeext->cur_channel, pmlmeext->cur_ch_offset, - pmlmeext->cur_bwmode - ); + pmlmeext->cur_bwmode); =20 start_bss_network(padapter); =20 if ((padapter->securitypriv.dot11PrivacyAlgrthm =3D=3D _TKIP_) || (padapter->securitypriv.dot11PrivacyAlgrthm =3D=3D _AES_)) { /* restore group key, WEP keys is restored in ips_leave() */ - rtw_set_key( - padapter, + rtw_set_key(padapter,=20 psecuritypriv, psecuritypriv->dot118021XGrpKeyid, 0, - false - ); + false); } =20 spin_lock_bh(&pstapriv->asoc_list_lock); @@ -2128,11 +2085,9 @@ void stop_ap_mode(struct adapter *padapter) pmlmeext->bstart_bss =3D false; =20 /* reset and init security priv , this can refine with rtw_reset_security= priv */ - memset( - (unsigned char *)&padapter->securitypriv, - 0, - sizeof(struct security_priv) - ); + memset((unsigned char *)&padapter->securitypriv, + 0,=20 + sizeof(struct security_priv)); padapter->securitypriv.ndisauthtype =3D Ndis802_11AuthModeOpen; padapter->securitypriv.ndisencryptstatus =3D Ndis802_11WEPDisabled; =20 diff --git a/drivers/staging/rtl8723bs/core/rtw_cmd.c b/drivers/staging/rtl= 8723bs/core/rtw_cmd.c index ef2d92b5588a..f3dcf9600c3e 100644 --- a/drivers/staging/rtl8723bs/core/rtw_cmd.c +++ b/drivers/staging/rtl8723bs/core/rtw_cmd.c @@ -175,7 +175,8 @@ int rtw_init_cmd_priv(struct cmd_priv *pcmdpriv) if (!pcmdpriv->cmd_allocated_buf) return -ENOMEM; =20 - pcmdpriv->cmd_buf =3D pcmdpriv->cmd_allocated_buf + CMDBUFF_ALIGN_SZ - = ((SIZE_PTR)(pcmdpriv->cmd_allocated_buf) & (CMDBUFF_ALIGN_SZ-1)); + pcmdpriv->cmd_buf =3D pcmdpriv->cmd_allocated_buf + CMDBUFF_ALIGN_SZ - + ((SIZE_PTR)(pcmdpriv->cmd_allocated_buf) & (CMDBUFF_ALIGN_SZ - 1)); =20 pcmdpriv->rsp_allocated_buf =3D rtw_zmalloc(MAX_RSPSZ + 4); =20 @@ -184,7 +185,8 @@ int rtw_init_cmd_priv(struct cmd_priv *pcmdpriv) return -ENOMEM; } =20 - pcmdpriv->rsp_buf =3D pcmdpriv->rsp_allocated_buf + 4 - ((SIZE_PTR)(pcm= dpriv->rsp_allocated_buf) & 3); + pcmdpriv->rsp_buf =3D pcmdpriv->rsp_allocated_buf + 4 - + ((SIZE_PTR)(pcmdpriv->rsp_allocated_buf) & 3); =20 pcmdpriv->cmd_issued_cnt =3D 0; pcmdpriv->cmd_done_cnt =3D 0; @@ -204,7 +206,7 @@ int rtw_init_evt_priv(struct evt_priv *pevtpriv) =20 _init_workitem(&pevtpriv->c2h_wk, c2h_wk_callback, NULL); pevtpriv->c2h_wk_alive =3D false; - pevtpriv->c2h_queue =3D rtw_cbuf_alloc(C2H_QUEUE_MAX_LEN+1); + pevtpriv->c2h_queue =3D rtw_cbuf_alloc(C2H_QUEUE_MAX_LEN + 1); if (!pevtpriv->c2h_queue) return -ENOMEM; =20 @@ -305,7 +307,7 @@ int rtw_cmd_filter(struct cmd_priv *pcmdpriv, struct cm= d_obj *cmd_obj) bAllow =3D true; =20 if ((!pcmdpriv->padapter->hw_init_completed && !bAllow) || - !atomic_read(&pcmdpriv->cmdthd_running)) /* com_thread not running */ + !atomic_read(&pcmdpriv->cmdthd_running)) /* com_thread not running */ return _FAIL; =20 return _SUCCESS; @@ -362,9 +364,8 @@ void rtw_free_cmd_obj(struct cmd_obj *pcmd) =20 void rtw_stop_cmd_thread(struct adapter *adapter) { - if (adapter->cmdThread && - atomic_read(&adapter->cmdpriv.cmdthd_running) && - adapter->cmdpriv.stop_req =3D=3D 0) { + if (adapter->cmdThread && atomic_read(&adapter->cmdpriv.cmdthd_running) && + adapter->cmdpriv.stop_req =3D=3D 0) { adapter->cmdpriv.stop_req =3D 1; complete(&adapter->cmdpriv.cmd_queue_comp); wait_for_completion(&adapter->cmdpriv.terminate_cmdthread_comp); @@ -392,8 +393,8 @@ int rtw_cmd_thread(void *context) =20 while (1) { if (wait_for_completion_interruptible(&pcmdpriv->cmd_queue_comp)) { - netdev_dbg(padapter->pnetdev, - FUNC_ADPT_FMT " wait_for_completion_interruptible(&pcmdpriv->cmd_qu= eue_comp) return !=3D 0, break\n", + netdev_dbg(padapter->pnetdev, FUNC_ADPT_FMT + " wait_for_completion_interruptible(&pcmdpriv->cmd_queue_comp) return = !=3D 0, break\n", FUNC_ADPT_ARG(padapter)); break; } @@ -484,7 +485,9 @@ int rtw_cmd_thread(void *context) rtw_free_cmd_obj(pcmd); } else { /* todo: !!! fill rsp_buf to pcmd->rsp if (pcmd->rsp!=3D NULL) */ - pcmd_callback(pcmd->padapter, pcmd);/* need consider that free cmd_obj= in rtw_cmd_callback */ + pcmd_callback(pcmd->padapter, pcmd); /* need consider that free + * cmd_obj in rtw_cmd_callback + */ } } else { rtw_free_cmd_obj(pcmd); @@ -523,7 +526,7 @@ int rtw_cmd_thread(void *context) */ =20 u8 rtw_sitesurvey_cmd(struct adapter *padapter, struct ndis_802_11_ssid *= ssid, int ssid_num, - struct rtw_ieee80211_channel *ch, int ch_num) + struct rtw_ieee80211_channel *ch, int ch_num) { u8 res =3D _FAIL; struct cmd_obj *ph2c; @@ -557,7 +560,8 @@ u8 rtw_sitesurvey_cmd(struct adapter *padapter, struct= ndis_802_11_ssid *ssid, =20 for (i =3D 0; i < ssid_num && i < RTW_SSID_SCAN_AMOUNT; i++) { if (ssid[i].ssid_length) { - memcpy(&psurveyPara->ssid[i], &ssid[i], sizeof(struct ndis_802_11_ssid= )); + memcpy(&psurveyPara->ssid[i], &ssid[i], + sizeof(struct ndis_802_11_ssid)); psurveyPara->ssid_num++; } } @@ -569,7 +573,8 @@ u8 rtw_sitesurvey_cmd(struct adapter *padapter, struct= ndis_802_11_ssid *ssid, =20 for (i =3D 0; i < ch_num && i < RTW_CHANNEL_SCAN_AMOUNT; i++) { if (ch[i].hw_value && !(ch[i].flags & RTW_IEEE80211_CHAN_DISABLED)) { - memcpy(&psurveyPara->ch[i], &ch[i], sizeof(struct rtw_ieee80211_channe= l)); + memcpy(&psurveyPara->ch[i], &ch[i], + sizeof(struct rtw_ieee80211_channel)); psurveyPara->ch_num++; } } @@ -681,7 +686,8 @@ u8 rtw_joinbss_cmd(struct adapter *padapter, struct wl= an_network *pnetwork) struct security_priv *psecuritypriv =3D &padapter->securitypriv; struct registry_priv *pregistrypriv =3D &padapter->registrypriv; struct ht_priv *phtpriv =3D &pmlmepriv->htpriv; - enum ndis_802_11_network_infrastructure ndis_network_mode =3D pnetwork->n= etwork.infrastructure_mode; + enum ndis_802_11_network_infrastructure ndis_network_mode =3D + pnetwork->network.infrastructure_mode; struct mlme_ext_priv *pmlmeext =3D &padapter->mlmeextpriv; struct mlme_ext_info *pmlmeinfo =3D &pmlmeext->mlmext_info; u32 tmp_len; @@ -696,7 +702,7 @@ u8 rtw_joinbss_cmd(struct adapter *padapter, struct wl= an_network *pnetwork) t_len =3D sizeof(struct wlan_bssid_ex); =20 /* for hidden ap to set fw_state here */ - if (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) !=3D tr= ue) { + if (check_fwstate(pmlmepriv, WIFI_STATION_STATE | WIFI_ADHOC_STATE) !=3D = true) { switch (ndis_network_mode) { case Ndis802_11IBSS: set_fwstate(pmlmepriv, WIFI_ADHOC_STATE); @@ -706,7 +712,7 @@ u8 rtw_joinbss_cmd(struct adapter *padapter, struct wl= an_network *pnetwork) set_fwstate(pmlmepriv, WIFI_STATION_STATE); break; =20 - case Ndis802_11APMode: + case ndis80211_AP_mode: case Ndis802_11AutoUnknown: case Ndis802_11InfrastructureMax: break; @@ -721,10 +727,11 @@ u8 rtw_joinbss_cmd(struct adapter *padapter, struct = wlan_network *pnetwork) =20 psecuritypriv->authenticator_ie[0] =3D (unsigned char)psecnetwork->ie_len= gth; =20 - if ((psecnetwork->ie_length-12) < (256-1)) - memcpy(&psecuritypriv->authenticator_ie[1], &psecnetwork->ies[12], psecn= etwork->ie_length-12); + if ((psecnetwork->ie_length - 12) < (256 - 1)) + memcpy(&psecuritypriv->authenticator_ie[1], &psecnetwork->ies[12], + psecnetwork->ie_length - 12); else - memcpy(&psecuritypriv->authenticator_ie[1], &psecnetwork->ies[12], (256-= 1)); + memcpy(&psecuritypriv->authenticator_ie[1], &psecnetwork->ies[12], (256 = - 1)); =20 psecnetwork->ie_length =3D 0; /* Added by Albert 2009/02/18 */ @@ -735,12 +742,19 @@ u8 rtw_joinbss_cmd(struct adapter *padapter, struct = wlan_network *pnetwork) if (!pmlmepriv->assoc_by_bssid) memcpy(&pmlmepriv->assoc_bssid[0], &pnetwork->network.mac_address[0], ET= H_ALEN); =20 - psecnetwork->ie_length =3D rtw_restruct_sec_ie(padapter, &pnetwork->netwo= rk.ies[0], &psecnetwork->ies[0], pnetwork->network.ie_length); + psecnetwork->ie_length =3D rtw_restruct_sec_ie(padapter, + &pnetwork->network.ies[0], + &psecnetwork->ies[0], + pnetwork->network.ie_length); =20 pqospriv->qos_option =3D 0; =20 if (pregistrypriv->wmm_enable) { - tmp_len =3D rtw_restruct_wmm_ie(padapter, &pnetwork->network.ies[0], &ps= ecnetwork->ies[0], pnetwork->network.ie_length, psecnetwork->ie_length); + tmp_len =3D rtw_restruct_wmm_ie(padapter, + &pnetwork->network.ies[0], + &psecnetwork->ies[0], + pnetwork->network.ie_length, + psecnetwork->ie_length); =20 if (psecnetwork->ie_length !=3D tmp_len) { psecnetwork->ie_length =3D tmp_len; @@ -751,28 +765,39 @@ u8 rtw_joinbss_cmd(struct adapter *padapter, struct = wlan_network *pnetwork) } =20 phtpriv->ht_option =3D false; - ptmp =3D rtw_get_ie(&pnetwork->network.ies[12], WLAN_EID_HT_CAPABILITY, &= tmp_len, pnetwork->network.ie_length-12); + ptmp =3D rtw_get_ie(&pnetwork->network.ies[12], + WLAN_EID_HT_CAPABILITY, + &tmp_len, + pnetwork->network.ie_length - 12); if (pregistrypriv->ht_enable && ptmp && tmp_len > 0) { - /* Added by Albert 2010/06/23 */ - /* For the WEP mode, we will use the bg mode to do the connection to avo= id some IOT issue. */ - /* Especially for Realtek 8192u SoftAP. */ - if ((padapter->securitypriv.dot11PrivacyAlgrthm !=3D _WEP40_) && - (padapter->securitypriv.dot11PrivacyAlgrthm !=3D _WEP104_) && - (padapter->securitypriv.dot11PrivacyAlgrthm !=3D _TKIP_)) { + /* Added by Albert 2010/06/23 + * For the WEP mode, we will use the bg mode to + * do the connection to avoid some IOT issue. + * Especially for Realtek 8192u SoftAP. + */ + if ((padapter->securitypriv.dot11_privacy_algrthm !=3D _WEP40_) && + (padapter->securitypriv.dot11_privacy_algrthm !=3D _WEP104_) && + (padapter->securitypriv.dot11_privacy_algrthm !=3D _TKIP_)) { rtw_ht_use_default_setting(padapter); =20 - rtw_build_wmm_ie_ht(padapter, &psecnetwork->ies[12], &psecnetwork->ie_l= ength); + rtw_build_wmm_ie_ht(padapter, + &psecnetwork->ies[12], + &psecnetwork->ie_length); =20 /* rtw_restructure_ht_ie */ - rtw_restructure_ht_ie(padapter, &pnetwork->network.ies[12], &psecnetwor= k->ies[0], - pnetwork->network.ie_length-12, &psecnetwork->ie_length, - pnetwork->network.configuration.ds_config); + rtw_restructure_ht_ie(padapter, + &pnetwork->network.ies[12], + &psecnetwork->ies[0], + pnetwork->network.ie_length - 12, + &psecnetwork->ie_length, + pnetwork->network.configuration.ds_config); } } =20 rtw_append_exented_cap(padapter, &psecnetwork->ies[0], &psecnetwork->ie_l= ength); =20 - pmlmeinfo->assoc_AP_vendor =3D check_assoc_AP(pnetwork->network.ies, pnet= work->network.ie_length); + pmlmeinfo->assoc_AP_vendor =3D check_assoc_AP(pnetwork->network.ies, + pnetwork->network.ie_length); =20 pcmd->cmdsz =3D get_wlan_bssid_ex_sz(psecnetwork);/* get cmdsz before end= ian conversion */ =20 @@ -788,7 +813,9 @@ u8 rtw_joinbss_cmd(struct adapter *padapter, struct wl= an_network *pnetwork) return res; } =20 -u8 rtw_disassoc_cmd(struct adapter *padapter, u32 deauth_timeout_ms, bool = enqueue) /* for sta_mode */ +u8 rtw_disassoc_cmd(struct adapter *padapter, + u32 deauth_timeout_ms, + bool enqueue) /* for sta_mode */ { struct cmd_obj *cmdobj =3D NULL; struct disconnect_parm *param =3D NULL; @@ -824,7 +851,9 @@ u8 rtw_disassoc_cmd(struct adapter *padapter, u32 deaut= h_timeout_ms, bool enqueu return res; } =20 -u8 rtw_setopmode_cmd(struct adapter *padapter, enum ndis_802_11_network_i= nfrastructure networktype, bool enqueue) +u8 rtw_setopmode_cmd(struct adapter *padapter, + enum ndis_802_11_network_infrastructure networktype, + bool enqueue) { struct cmd_obj *ph2c; struct setopmode_parm *psetop; @@ -877,14 +906,16 @@ u8 rtw_setstakey_cmd(struct adapter *padapter, struct= sta_info *sta, u8 unicast_ memcpy(psetstakey_para->addr, sta->hwaddr, ETH_ALEN); =20 if (check_fwstate(pmlmepriv, WIFI_STATION_STATE)) - psetstakey_para->algorithm =3D (unsigned char)psecuritypriv->dot11Privac= yAlgrthm; + psetstakey_para->algorithm =3D (unsigned char)psecuritypriv->dot11_priva= cy_algrthm; else GET_ENCRY_ALGO(psecuritypriv, sta, psetstakey_para->algorithm, false); =20 if (unicast_key) memcpy(&psetstakey_para->key, &sta->dot118021x_UncstKey, 16); else - memcpy(&psetstakey_para->key, &psecuritypriv->dot118021XGrpKey[psecurity= priv->dot118021XGrpKeyid].skey, 16); + memcpy(&psetstakey_para->key, + &psecuritypriv->dot118021XGrpKey[psecuritypriv->dot118021XGrpKeyi= d].skey, + 16); =20 /* jeff: set this because at least sw key is ready */ padapter->securitypriv.busetkipkey =3D true; @@ -1002,6 +1033,7 @@ u8 rtw_addbareq_cmd(struct adapter *padapter, u8 tid,= u8 *addr) exit: return res; } + /* add for CONFIG_IEEE80211W, none 11w can use it */ u8 rtw_reset_securitypriv_cmd(struct adapter *padapter) { @@ -1117,13 +1149,17 @@ static void collect_traffic_statistics(struct adapt= er *padapter) pdvobjpriv->traffic_stat.rx_drop =3D padapter->recvpriv.rx_drop; =20 /* Calculate throughput in last interval */ - pdvobjpriv->traffic_stat.cur_tx_bytes =3D pdvobjpriv->traffic_stat.tx_byt= es - pdvobjpriv->traffic_stat.last_tx_bytes; - pdvobjpriv->traffic_stat.cur_rx_bytes =3D pdvobjpriv->traffic_stat.rx_byt= es - pdvobjpriv->traffic_stat.last_rx_bytes; + pdvobjpriv->traffic_stat.cur_tx_bytes =3D pdvobjpriv->traffic_stat.tx_byt= es - + pdvobjpriv->traffic_stat.last_tx_bytes; + pdvobjpriv->traffic_stat.cur_rx_bytes =3D pdvobjpriv->traffic_stat.rx_byt= es - + pdvobjpriv->traffic_stat.last_rx_bytes; pdvobjpriv->traffic_stat.last_tx_bytes =3D pdvobjpriv->traffic_stat.tx_by= tes; pdvobjpriv->traffic_stat.last_rx_bytes =3D pdvobjpriv->traffic_stat.rx_by= tes; =20 - pdvobjpriv->traffic_stat.cur_tx_tp =3D (u32)(pdvobjpriv->traffic_stat.cur= _tx_bytes * 8/2/1024/1024); - pdvobjpriv->traffic_stat.cur_rx_tp =3D (u32)(pdvobjpriv->traffic_stat.cur= _rx_bytes * 8/2/1024/1024); + pdvobjpriv->traffic_stat.cur_tx_tp =3D (u32)(pdvobjpriv->traffic_stat.cur= _tx_bytes * + 8 / 2 / 1024 / 1024); + pdvobjpriv->traffic_stat.cur_rx_tp =3D (u32)(pdvobjpriv->traffic_stat.cur= _rx_bytes * + 8 / 2 / 1024 / 1024); } =20 u8 traffic_status_watchdog(struct adapter *padapter, u8 from_timer) @@ -1148,10 +1184,11 @@ u8 traffic_status_watchdog(struct adapter *padapter= , u8 from_timer) BusyThreshold =3D BusyThresholdLow; =20 if (pmlmepriv->LinkDetectInfo.NumRxOkInPeriod > BusyThreshold || - pmlmepriv->LinkDetectInfo.NumTxOkInPeriod > BusyThreshold) { + pmlmepriv->LinkDetectInfo.NumTxOkInPeriod > BusyThreshold) { bBusyTraffic =3D true; =20 - if (pmlmepriv->LinkDetectInfo.NumRxOkInPeriod > pmlmepriv->LinkDetectIn= fo.NumTxOkInPeriod) + if (pmlmepriv->LinkDetectInfo.NumRxOkInPeriod > + pmlmepriv->LinkDetectInfo.NumTxOkInPeriod) bRxBusyTraffic =3D true; else bTxBusyTraffic =3D true; @@ -1159,18 +1196,20 @@ u8 traffic_status_watchdog(struct adapter *padapter= , u8 from_timer) =20 /* Higher Tx/Rx data. */ if (pmlmepriv->LinkDetectInfo.NumRxOkInPeriod > 4000 || - pmlmepriv->LinkDetectInfo.NumTxOkInPeriod > 4000) { + pmlmepriv->LinkDetectInfo.NumTxOkInPeriod > 4000) { bHigherBusyTraffic =3D true; =20 - if (pmlmepriv->LinkDetectInfo.NumRxOkInPeriod > pmlmepriv->LinkDetectIn= fo.NumTxOkInPeriod) + if (pmlmepriv->LinkDetectInfo.NumRxOkInPeriod > + pmlmepriv->LinkDetectInfo.NumTxOkInPeriod) bHigherBusyRxTraffic =3D true; else bHigherBusyTxTraffic =3D true; } =20 /* check traffic for powersaving. */ - if (((pmlmepriv->LinkDetectInfo.NumRxUnicastOkInPeriod + pmlmepriv->Link= DetectInfo.NumTxOkInPeriod) > 8) || - (pmlmepriv->LinkDetectInfo.NumRxUnicastOkInPeriod > 2)) { + if (((pmlmepriv->LinkDetectInfo.NumRxUnicastOkInPeriod + + pmlmepriv->LinkDetectInfo.NumTxOkInPeriod) > 8) || + (pmlmepriv->LinkDetectInfo.NumRxUnicastOkInPeriod > 2)) { bEnterPS =3D false; =20 if (bBusyTraffic) { @@ -1179,7 +1218,7 @@ u8 traffic_status_watchdog(struct adapter *padapter, = u8 from_timer) =20 pmlmepriv->LinkDetectInfo.TrafficTransitionCount++; =20 - if (pmlmepriv->LinkDetectInfo.TrafficTransitionCount > 30/*TrafficTran= sitionLevel*/) + if (pmlmepriv->LinkDetectInfo.TrafficTransitionCount > 30 /*TrafficTra= nsitionLevel*/) pmlmepriv->LinkDetectInfo.TrafficTransitionCount =3D 30; } } else { @@ -1224,7 +1263,6 @@ u8 traffic_status_watchdog(struct adapter *padapter, = u8 from_timer) pmlmepriv->LinkDetectInfo.bHigherBusyTxTraffic =3D bHigherBusyTxTraffic; =20 return bEnterPS; - } =20 static void dynamic_chk_wk_hdl(struct adapter *padapter) @@ -1264,7 +1302,7 @@ void lps_ctrl_wk_hdl(struct adapter *padapter, u8 lps= _ctrl_type) u8 mstatus; =20 if (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) || - check_fwstate(pmlmepriv, WIFI_ADHOC_STATE)) { + check_fwstate(pmlmepriv, WIFI_ADHOC_STATE)) { return; } =20 @@ -1444,9 +1482,7 @@ u8 rtw_dm_ra_mask_wk_cmd(struct adapter *padapter, u8= *psta) res =3D rtw_enqueue_cmd(pcmdpriv, ph2c); =20 exit: - return res; - } =20 u8 rtw_ps_cmd(struct adapter *padapter) @@ -1516,9 +1552,7 @@ static void rtw_chk_hi_queue_hdl(struct adapter *pada= pter) } else {/* re check again */ rtw_chk_hi_queue_cmd(padapter); } - } - } =20 u8 rtw_chk_hi_queue_cmd(struct adapter *padapter) @@ -1598,9 +1632,9 @@ static void rtw_btinfo_hdl(struct adapter *adapter, u= 8 *buf, u16 buf_len) =20 cmd_idx =3D info->cid; =20 - if (info->len > buf_len-2) { + if (info->len > buf_len - 2) { rtw_warn_on(1); - len =3D buf_len-2; + len =3D buf_len - 2; } else { len =3D info->len; } @@ -1610,7 +1644,7 @@ static void rtw_btinfo_hdl(struct adapter *adapter, u= 8 *buf, u16 buf_len) buf[1] =3D 0; else if (cmd_idx =3D=3D BTINFO_BT_AUTO_RPT) buf[1] =3D 2; - hal_btcoex_BtInfoNotify(adapter, len+1, &buf[1]); + hal_btcoex_BtInfoNotify(adapter, len + 1, &buf[1]); } =20 u8 rtw_c2h_packet_wk_cmd(struct adapter *padapter, u8 *pbuf, u16 length) @@ -1670,7 +1704,7 @@ u8 rtw_c2h_wk_cmd(struct adapter *padapter, u8 *c2h_e= vt) =20 pdrvextra_cmd_parm->ec_id =3D C2H_WK_CID; pdrvextra_cmd_parm->type =3D 0; - pdrvextra_cmd_parm->size =3D c2h_evt?16:0; + pdrvextra_cmd_parm->size =3D c2h_evt ? 16 : 0; pdrvextra_cmd_parm->pbuf =3D c2h_evt; =20 init_h2fwcmd_w_parm_no_rsp(ph2c, pdrvextra_cmd_parm, GEN_CMD_CODE(_Set_Dr= v_Extra)); @@ -1739,7 +1773,9 @@ u8 rtw_drvextra_cmd_hdl(struct adapter *padapter, uns= igned char *pbuf) pdrvextra_cmd =3D (struct drvextra_cmd_parm *)pbuf; =20 switch (pdrvextra_cmd->ec_id) { - case DYNAMIC_CHK_WK_CID:/* only primary padapter go to this cmd, but exe= cute dynamic_chk_wk_hdl() for two interfaces */ + case DYNAMIC_CHK_WK_CID: /* only primary padapter go to this cmd, + * but execute dynamic_chk_wk_hdl() for two interfaces + */ dynamic_chk_wk_hdl(padapter); break; case POWER_SAVING_CTRL_WK_CID: @@ -1765,7 +1801,10 @@ u8 rtw_drvextra_cmd_hdl(struct adapter *padapter, un= signed char *pbuf) rtw_free_assoc_resources(padapter, 1); break; case C2H_WK_CID: - rtw_hal_set_hwreg_with_buf(padapter, HW_VAR_C2H_HANDLE, pdrvextra_cmd->p= buf, pdrvextra_cmd->size); + rtw_hal_set_hwreg_with_buf(padapter, + HW_VAR_C2H_HANDLE, + pdrvextra_cmd->pbuf, + pdrvextra_cmd->size); break; case DM_RA_MSK_WK_CID: rtw_dm_ra_mask_hdl(padapter, (struct sta_info *)pdrvextra_cmd->pbuf); @@ -1876,12 +1915,12 @@ void rtw_createbss_cmd_callback(struct adapter *pad= apter, struct cmd_obj *pcmd) _clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING); =20 spin_unlock_bh(&pmlmepriv->scanned_queue.lock); - /* we will set _FW_LINKED when there is one more sat to join us (rtw_st= assoc_event_callback) */ - + /* we will set _FW_LINKED when there is one more + * sat to join us (rtw_stassoc_event_callback) + */ } =20 createbss_cmd_fail: - spin_unlock_bh(&pmlmepriv->lock); exit: rtw_free_cmd_obj(pcmd); --=20 2.43.0