From nobody Mon Oct 6 15:26:06 2025 Received: from mail-qv1-f45.google.com (mail-qv1-f45.google.com [209.85.219.45]) (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 D7C233FE4 for ; Sat, 19 Jul 2025 23:07:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752966451; cv=none; b=oYLubv9xcCVN6Wfz2/JVanygyOClSHCXLPlDOAEgW2346YUFeQaFBKkZYxmFfVMogQMqN47bGxbBDou7MwUsbmTNz8riz6xghlk+3uP/STTcoFmlyoju+vrtzy/ANMFjUKzqc8pFDaDAJfk3m/2xnfwUyT485slJuwaIuXNE+NQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752966451; c=relaxed/simple; bh=IZl6VohGFdiqH87kzqBkbtjuI7Bb4PfO+xB+t7+2VNk=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version:Content-Type; b=m1KfYrsIX9UBHP4MrDQGqh76QHzNJcJBKA6/syQNyiOTl6kxgWsKMdXp+vANdMXNpt+nke/w/P3tGm+3x4TVp/tM2JhBpfaTMD7xNY+Fw6ycy1mplpogYaztotlZ6zv1JG6NPuxEyBaAbC3WMTncdWjH5bEmcU+2oqv46l+S6EQ= 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=mfCCF+o5; arc=none smtp.client-ip=209.85.219.45 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="mfCCF+o5" Received: by mail-qv1-f45.google.com with SMTP id 6a1803df08f44-7050bc6bea9so24480696d6.3 for ; Sat, 19 Jul 2025 16:07:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1752966446; x=1753571246; 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=cSlPFFReNBhad2IsuuJVG/iNzQxl5C6fS+x3+oQo7l4=; b=mfCCF+o5y+0BFXS7ke0gF46X2dX64xUrhq5D1HFhrA1HtqsQrgQ/UDpJTMPcIVF2jd NOdykvDbUs4FAhMKV6wTl6Mvbnwe1ZQf/rj7EpG4kPlwyBQb1v2SrCuUB/KWYBrsxsLH /KqSkgziuGOXQe60+mWKr7K23MWdOS9Bi9Z6O9A0e9jgK5NitKEhLzZdWhoeZkBtOiey yoKq5vJV2Unf41aH09Vcck/eETeBfsyP6ZCo4omeACb1WPyt6owYDNW6MqLOpSK4WBQ7 EU/1VNFnjGnstJCgIk4kEldkd5baAYxaPjpRFEu7WsDl8QGtgyNE2vojVuIo/GS6F/BQ 946Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752966446; x=1753571246; 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=cSlPFFReNBhad2IsuuJVG/iNzQxl5C6fS+x3+oQo7l4=; b=KY/ZqN91cX0iVL+aOyVvYoyfBDoLhUJmgGlOTueX9mm6dwb0ayutMSNwMqrp0MQzU/ AqADgaFV8dGBwOd8kSyLQLPu2TafT+8eNOVSYroAT4386iPRlx96LNjEmJGZgZy1Cp02 jM77qLq7TFSIerRnvcliLuOgVteZ9x3bhF46qhgb1i0J6HMf2B0Ribv8iieSoYZOSV14 vK0x013IOoa5imI1xTKI5PnCsswZLQ75xH/3GwyZd1cqTy6ZcUjAPZBswSoETCjH/hKN C3TW212ygMTYYG8OolzfOSpxyQo/HEcYTbKbGhZ4nYNIidRdBqogHSW7cmyl2lwB9QYC xF3A== X-Forwarded-Encrypted: i=1; AJvYcCUguRlr/lEIezuk5Pmp9+WQtXMl0uhvuoMelnkFOSDcta+RxoIzr8WV7MkgA0/o/mCMiFFPsHrmgaedVYA=@vger.kernel.org X-Gm-Message-State: AOJu0YzNVCnTVTxI9bqylKF6VRc5i+unn9dUuqhkymhOasBpJ6GFUTkv aF122zIY8aL85G44rpm5x9FB4HjCZAJWnOUkaz7Dq9NBiO/42SV8JHOEH8/rYD8D X-Gm-Gg: ASbGncv7D5trm0PouvhuIpnORL0vIENJFNpRafTi4PQIcomrKSr+to3PfiRnA2zRZX7 0CdnF5emz+pXMTJWfaXfL8tDSJY54RbCefiSDt9Dh0bU/ZHknXLOUrduaRICKJFAvaY62Kujrmm T6rPYovBE6dzkboG1HsOOpIrdJ0vsmz4aosDq0juM2sBlGEhlAPFtuQJlJ37y/Jh/pW+lUYejfu becG3i/SztBg5vXiEd/iX2fjYM0lWBll3R/xB9vRUwDbejo5PdKa8JYU/Y0aouWZ47jrTyTKQGq F147KEVzl/3Cp1hQCbeWe7Kf7uVUJVy/UF64fDSU7CtJwrj3R8FJ2MkhoH4aKjUqyjwTJkOef/0 Pmu7LFvTPASz8cvDAJK0YA31Wdcz0agU/cKmF22fFLgyzjPMlhxo= X-Google-Smtp-Source: AGHT+IE+LWzXLJug5gFlDMPKzjDwhXTAg0zABDnIE1+SWiziege8Fxi1ar8baaAlCTWExMHFBF0fgQ== X-Received: by 2002:ad4:5c4c:0:b0:6fd:a382:f86f with SMTP id 6a1803df08f44-704f6b2640amr269874946d6.34.1752966445021; Sat, 19 Jul 2025 16:07:25 -0700 (PDT) Received: from linux-kernel-dev-start.. ([159.203.26.228]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-7051b90616asm23075736d6.35.2025.07.19.16.07.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 19 Jul 2025 16:07:24 -0700 (PDT) From: Vivek BalachandharTN To: gregkh@linuxfoundation.org Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, vivek.balachandhar@gmail.com Subject: [PATCH] staging: rtl8723bs: Improve indentation consistency in rtw_mlme.c Date: Sat, 19 Jul 2025 23:07:07 +0000 Message-Id: <20250719230707.238377-1-vivek.balachandhar@gmail.com> X-Mailer: git-send-email 2.39.5 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable This patch cleans up inconsistent indentation in rtw_mlme.c to improve code readability and align with kernel coding style. This is a partial cleanup =E2=80=94 other style issues like camelCase varia= bles and line wrapping in few nested loops will be addressed in future patches. Signed-off-by: Vivek BalachandharTN --- drivers/staging/rtl8723bs/core/rtw_mlme.c | 595 ++++++++++++---------- 1 file changed, 329 insertions(+), 266 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rt= l8723bs/core/rtw_mlme.c index 6301dbbcc472..3fbc1e22c10f 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c @@ -22,7 +22,10 @@ int rtw_init_mlme_priv(struct adapter *padapter) pmlmepriv->pscanned =3D NULL; pmlmepriv->fw_state =3D WIFI_STATION_STATE; /* Must sync with rtw_wdev_a= lloc() */ pmlmepriv->cur_network.network.infrastructure_mode =3D Ndis802_11AutoUnkn= own; - pmlmepriv->scan_mode =3D SCAN_ACTIVE;/* 1: active, 0: passive. Maybe som= eday we should rename this varable to "active_mode" (Jeff) */ + /* 1: active, 0: passive. Maybe someday we should + * rename this varable to "active_mode" (Jeff) + */ + pmlmepriv->scan_mode =3D SCAN_ACTIVE; =20 spin_lock_init(&pmlmepriv->lock); INIT_LIST_HEAD(&pmlmepriv->free_bss_pool.queue); @@ -95,7 +98,8 @@ void rtw_free_mlme_priv_ie_data(struct mlme_priv *pmlmepr= iv) rtw_free_mlme_ie_data(&pmlmepriv->p2p_beacon_ie, &pmlmepriv->p2p_beacon_i= e_len); rtw_free_mlme_ie_data(&pmlmepriv->p2p_probe_req_ie, &pmlmepriv->p2p_probe= _req_ie_len); rtw_free_mlme_ie_data(&pmlmepriv->p2p_probe_resp_ie, &pmlmepriv->p2p_prob= e_resp_ie_len); - rtw_free_mlme_ie_data(&pmlmepriv->p2p_go_probe_resp_ie, &pmlmepriv->p2p_g= o_probe_resp_ie_len); + rtw_free_mlme_ie_data(&pmlmepriv->p2p_go_probe_resp_ie, + &pmlmepriv->p2p_go_probe_resp_ie_len); rtw_free_mlme_ie_data(&pmlmepriv->p2p_assoc_req_ie, &pmlmepriv->p2p_assoc= _req_ie_len); } =20 @@ -119,7 +123,7 @@ struct wlan_network *rtw_alloc_network(struct mlme_priv= *pmlmepriv) pnetwork =3D NULL; goto exit; } - plist =3D get_next(&(free_queue->queue)); + plist =3D get_next(&free_queue->queue); =20 pnetwork =3D container_of(plist, struct wlan_network, list); =20 @@ -141,7 +145,7 @@ void _rtw_free_network(struct mlme_priv *pmlmepriv, str= uct wlan_network *pnetwor { unsigned int delta_time; u32 lifetime =3D SCANQUEUE_LIFETIME; - struct __queue *free_queue =3D &(pmlmepriv->free_bss_pool); + struct __queue *free_queue =3D &pmlmepriv->free_bss_pool; =20 if (!pnetwork) return; @@ -150,7 +154,7 @@ void _rtw_free_network(struct mlme_priv *pmlmepriv, str= uct wlan_network *pnetwor return; =20 if ((check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) =3D=3D true) || - (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) =3D=3D true)) + (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) =3D=3D true)) lifetime =3D 1; =20 if (!isfreeall) { @@ -161,17 +165,16 @@ void _rtw_free_network(struct mlme_priv *pmlmepriv, s= truct wlan_network *pnetwor =20 spin_lock_bh(&free_queue->lock); =20 - list_del_init(&(pnetwork->list)); + list_del_init(&pnetwork->list); =20 - list_add_tail(&(pnetwork->list), &(free_queue->queue)); + list_add_tail(&pnetwork->list, &free_queue->queue); =20 spin_unlock_bh(&free_queue->lock); } =20 void _rtw_free_network_nolock(struct mlme_priv *pmlmepriv, struct wlan_net= work *pnetwork) { - - struct __queue *free_queue =3D &(pmlmepriv->free_bss_pool); + struct __queue *free_queue =3D &pmlmepriv->free_bss_pool; =20 if (!pnetwork) return; @@ -179,16 +182,15 @@ void _rtw_free_network_nolock(struct mlme_priv *pmlme= priv, struct wlan_network * if (pnetwork->fixed) return; =20 - list_del_init(&(pnetwork->list)); + list_del_init(&pnetwork->list); =20 - list_add_tail(&(pnetwork->list), get_list_head(free_queue)); + list_add_tail(&pnetwork->list, get_list_head(free_queue)); } =20 /* - return the wlan_network with the matching addr - - Shall be called under atomic context... to avoid possible racing conditio= n... -*/ + * return the wlan_network with the matching addr + * Shall be called under atomic context... to avoid possible racing condit= ion... + */ struct wlan_network *_rtw_find_network(struct __queue *scanned_queue, u8 *= addr) { struct list_head *phead, *plist; @@ -225,11 +227,9 @@ void rtw_free_network_queue(struct adapter *padapter, = u8 isfreeall) =20 phead =3D get_list_head(scanned_queue); list_for_each_safe(plist, tmp, phead) { - pnetwork =3D list_entry(plist, struct wlan_network, list); =20 _rtw_free_network(pmlmepriv, pnetwork, isfreeall); - } =20 spin_unlock_bh(&scanned_queue->lock); @@ -240,7 +240,7 @@ signed int rtw_if_up(struct adapter *padapter) signed int res; =20 if (padapter->bDriverStopped || padapter->bSurpriseRemoved || - (check_fwstate(&padapter->mlmepriv, _FW_LINKED) =3D=3D false)) + (check_fwstate(&padapter->mlmepriv, _FW_LINKED) =3D=3D false)) res =3D false; else res =3D true; @@ -256,8 +256,8 @@ void rtw_generate_random_ibss(u8 *pibss) pibss[1] =3D 0x11; pibss[2] =3D 0x87; pibss[3] =3D (u8)(curtime & 0xff) ;/* p[0]; */ - pibss[4] =3D (u8)((curtime>>8) & 0xff) ;/* p[1]; */ - pibss[5] =3D (u8)((curtime>>16) & 0xff) ;/* p[2]; */ + pibss[4] =3D (u8)((curtime >> 8) & 0xff) ;/* p[1]; */ + pibss[5] =3D (u8)((curtime >> 16) & 0xff) ;/* p[2]; */ } =20 u8 *rtw_get_capability_from_ie(u8 *ie) @@ -287,15 +287,14 @@ void rtw_free_mlme_priv(struct mlme_priv *pmlmepriv) void rtw_free_network_nolock(struct adapter *padapter, struct wlan_network= *pnetwork); void rtw_free_network_nolock(struct adapter *padapter, struct wlan_network= *pnetwork) { - _rtw_free_network_nolock(&(padapter->mlmepriv), pnetwork); + _rtw_free_network_nolock(&padapter->mlmepriv, pnetwork); rtw_cfg80211_unlink_bss(padapter, pnetwork); } =20 /* - return the wlan_network with the matching addr - - Shall be called under atomic context... to avoid possible racing conditio= n... -*/ + * return the wlan_network with the matching addr + * Shall be called under atomic context... to avoid possible racing condit= ion... + */ struct wlan_network *rtw_find_network(struct __queue *scanned_queue, u8 *a= ddr) { struct wlan_network *pnetwork =3D _rtw_find_network(scanned_queue, addr); @@ -309,7 +308,7 @@ int rtw_is_same_ibss(struct adapter *adapter, struct wl= an_network *pnetwork) struct security_priv *psecuritypriv =3D &adapter->securitypriv; =20 if ((psecuritypriv->dot11PrivacyAlgrthm !=3D _NO_PRIVACY_) && - (pnetwork->network.privacy =3D=3D 0)) + (pnetwork->network.privacy =3D=3D 0)) ret =3D false; else if ((psecuritypriv->dot11PrivacyAlgrthm =3D=3D _NO_PRIVACY_) && (pnetwork->network.privacy =3D=3D 1)) @@ -318,13 +317,12 @@ int rtw_is_same_ibss(struct adapter *adapter, struct = wlan_network *pnetwork) ret =3D true; =20 return ret; - } =20 inline int is_same_ess(struct wlan_bssid_ex *a, struct wlan_bssid_ex *b) { - return (a->ssid.ssid_length =3D=3D b->ssid.ssid_length) - && !memcmp(a->ssid.ssid, b->ssid.ssid, a->ssid.ssid_length); + return (a->ssid.ssid_length =3D=3D b->ssid.ssid_length) && + !memcmp(a->ssid.ssid, b->ssid.ssid, a->ssid.ssid_length); } =20 int is_same_network(struct wlan_bssid_ex *src, struct wlan_bssid_ex *dst, = u8 feature) @@ -348,10 +346,10 @@ int is_same_network(struct wlan_bssid_ex *src, struct= wlan_bssid_ex *dst, u8 fea (d_cap & WLAN_CAPABILITY_IBSS)) && ((s_cap & WLAN_CAPABILITY_ESS) =3D=3D (d_cap & WLAN_CAPABILITY_ESS)); - } =20 -struct wlan_network *_rtw_find_same_network(struct __queue *scanned_queue,= struct wlan_network *network) +struct wlan_network *_rtw_find_same_network(struct __queue *scanned_queue, + struct wlan_network *network) { struct list_head *phead, *plist; struct wlan_network *found =3D NULL; @@ -380,7 +378,6 @@ struct wlan_network *rtw_get_oldest_wlan_network(struct= __queue *scanned_queue) phead =3D get_list_head(scanned_queue); =20 list_for_each(plist, phead) { - pwlan =3D list_entry(plist, struct wlan_network, list); =20 if (!pwlan->fixed) { @@ -389,11 +386,10 @@ struct wlan_network *rtw_get_oldest_wlan_network(stru= ct __queue *scanned_queue) } } return oldest; - } =20 void update_network(struct wlan_bssid_ex *dst, struct wlan_bssid_ex *src, - struct adapter *padapter, bool update_ie) + struct adapter *padapter, bool update_ie) { long rssi_ori =3D dst->rssi; =20 @@ -404,27 +400,31 @@ void update_network(struct wlan_bssid_ex *dst, struct= wlan_bssid_ex *src, long rssi_final; =20 /* The rule below is 1/5 for sample value, 4/5 for history value */ - if (check_fwstate(&padapter->mlmepriv, _FW_LINKED) && is_same_network(&(p= adapter->mlmepriv.cur_network.network), src, 0)) { + if (check_fwstate(&padapter->mlmepriv, _FW_LINKED) && + is_same_network(&padapter->mlmepriv.cur_network.network, src, 0)) { /* Take the recvpriv's value for the connected AP*/ ss_final =3D padapter->recvpriv.signal_strength; sq_final =3D padapter->recvpriv.signal_qual; /* the rssi value here is undecorated, and will be used for antenna dive= rsity */ if (sq_smp !=3D 101) /* from the right channel */ - rssi_final =3D (src->rssi+dst->rssi*4)/5; + rssi_final =3D (src->rssi + dst->rssi * 4) / 5; else rssi_final =3D rssi_ori; } else { if (sq_smp !=3D 101) { /* from the right channel */ - ss_final =3D ((u32)(src->phy_info.signal_strength)+(u32)(dst->phy_info.= signal_strength)*4)/5; - sq_final =3D ((u32)(src->phy_info.signal_quality)+(u32)(dst->phy_info.s= ignal_quality)*4)/5; - rssi_final =3D (src->rssi+dst->rssi*4)/5; + ss_final =3D ((u32)(src->phy_info.signal_strength) + + (u32)(dst->phy_info.signal_strength) * 4) / 5; + sq_final =3D ((u32)(src->phy_info.signal_quality) + + (u32)(dst->phy_info.signal_quality) * 4) / 5; + rssi_final =3D (src->rssi + dst->rssi * 4) / 5; } else { - /* bss info not receiving from the right channel, use the original RX s= ignal infos */ + /* bss info not receiving from the right channel, + * use the original RX signal infos + */ ss_final =3D dst->phy_info.signal_strength; sq_final =3D dst->phy_info.signal_quality; rssi_final =3D dst->rssi; } - } =20 if (update_ie) { @@ -440,29 +440,31 @@ void update_network(struct wlan_bssid_ex *dst, struct= wlan_bssid_ex *src, =20 static void update_current_network(struct adapter *adapter, struct wlan_bs= sid_ex *pnetwork) { - struct mlme_priv *pmlmepriv =3D &(adapter->mlmepriv); + struct mlme_priv *pmlmepriv =3D &adapter->mlmepriv; =20 - rtw_bug_check(&(pmlmepriv->cur_network.network), - &(pmlmepriv->cur_network.network), - &(pmlmepriv->cur_network.network), - &(pmlmepriv->cur_network.network)); + rtw_bug_check(&pmlmepriv->cur_network.network, + &pmlmepriv->cur_network.network, + &pmlmepriv->cur_network.network, + &pmlmepriv->cur_network.network); =20 - if ((check_fwstate(pmlmepriv, _FW_LINKED) =3D=3D true) && (is_same_networ= k(&(pmlmepriv->cur_network.network), pnetwork, 0))) { - update_network(&(pmlmepriv->cur_network.network), pnetwork, adapter, tru= e); - rtw_update_protection(adapter, (pmlmepriv->cur_network.network.ies) + si= zeof(struct ndis_802_11_fix_ie), - pmlmepriv->cur_network.network.ie_length); + if ((check_fwstate(pmlmepriv, _FW_LINKED) =3D=3D true) && + (is_same_network(&pmlmepriv->cur_network.network, pnetwork, 0))) { + update_network(&pmlmepriv->cur_network.network, pnetwork, adapter, true); + rtw_update_protection(adapter, (pmlmepriv->cur_network.network.ies) + + sizeof(struct ndis_802_11_fix_ie), + pmlmepriv->cur_network.network.ie_length); } } =20 /* -Caller must hold pmlmepriv->lock first. -*/ + * Caller must hold pmlmepriv->lock first. + */ void rtw_update_scanned_network(struct adapter *adapter, struct wlan_bssid= _ex *target) { struct list_head *plist, *phead; u32 bssid_ex_sz; - struct mlme_priv *pmlmepriv =3D &(adapter->mlmepriv); - struct __queue *queue =3D &(pmlmepriv->scanned_queue); + struct mlme_priv *pmlmepriv =3D &adapter->mlmepriv; + struct __queue *queue =3D &pmlmepriv->scanned_queue; struct wlan_network *pnetwork =3D NULL; struct wlan_network *oldest =3D NULL; int target_find =3D 0; @@ -475,22 +477,24 @@ void rtw_update_scanned_network(struct adapter *adapt= er, struct wlan_bssid_ex *t =20 rtw_bug_check(pnetwork, pnetwork, pnetwork, pnetwork); =20 - if (is_same_network(&(pnetwork->network), target, feature)) { + if (is_same_network(&pnetwork->network, target, feature)) { target_find =3D 1; break; } =20 if (rtw_roam_flags(adapter)) { - /* TODO: don't select network in the same ess as oldest if it's new eno= ugh*/ + /* TODO: don't select network in the + * same ess as oldest if it's new enough + */ } =20 if (!oldest || time_after(oldest->last_scanned, pnetwork->last_scanned)) oldest =3D pnetwork; - } =20 /* If we didn't find a match, then get a new network slot to initialize - * with this beacon's information */ + * with this beacon's information + */ if (!target_find) { if (list_empty(&pmlmepriv->free_bss_pool.queue)) { /* If there are no more slots, expire the oldest */ @@ -499,7 +503,7 @@ void rtw_update_scanned_network(struct adapter *adapter= , struct wlan_bssid_ex *t if (!pnetwork) goto exit; =20 - memcpy(&(pnetwork->network), target, get_wlan_bssid_ex_sz(target)); + memcpy(&pnetwork->network, target, get_wlan_bssid_ex_sz(target)); /* variable initialize */ pnetwork->fixed =3D false; pnetwork->last_scanned =3D jiffies; @@ -521,7 +525,7 @@ void rtw_update_scanned_network(struct adapter *adapter= , struct wlan_bssid_ex *t =20 bssid_ex_sz =3D get_wlan_bssid_ex_sz(target); target->length =3D bssid_ex_sz; - memcpy(&(pnetwork->network), target, bssid_ex_sz); + memcpy(&pnetwork->network, target, bssid_ex_sz); =20 pnetwork->last_scanned =3D jiffies; =20 @@ -529,8 +533,7 @@ void rtw_update_scanned_network(struct adapter *adapter= , struct wlan_bssid_ex *t if (pnetwork->network.phy_info.signal_quality =3D=3D 101) pnetwork->network.phy_info.signal_quality =3D 0; =20 - list_add_tail(&(pnetwork->list), &(queue->queue)); - + list_add_tail(&pnetwork->list, &queue->queue); } } else { /* we have an entry and we are going to update it. But this entry may @@ -553,7 +556,7 @@ void rtw_update_scanned_network(struct adapter *adapter= , struct wlan_bssid_ex *t update_ie =3D false; } =20 - update_network(&(pnetwork->network), target, adapter, update_ie); + update_network(&pnetwork->network, target, adapter, update_ie); } =20 exit: @@ -569,10 +572,10 @@ void rtw_add_network(struct adapter *adapter, struct = wlan_bssid_ex *pnetwork) =20 /* select the desired network based on the capability of the (i)bss. */ /* check items: (1) security */ -/* (2) network_type */ -/* (3) WMM */ -/* (4) HT */ -/* (5) others */ +/* (2) network_type */ +/* (3) WMM */ +/* (4) HT */ +/* (5) others */ int rtw_is_desired_network(struct adapter *adapter, struct wlan_network *p= network); int rtw_is_desired_network(struct adapter *adapter, struct wlan_network *p= network) { @@ -587,11 +590,12 @@ int rtw_is_desired_network(struct adapter *adapter, s= truct wlan_network *pnetwor privacy =3D pnetwork->network.privacy; =20 if (check_fwstate(pmlmepriv, WIFI_UNDER_WPS)) { - if (rtw_get_wps_ie(pnetwork->network.ies+_FIXED_IE_LENGTH_, pnetwork->ne= twork.ie_length-_FIXED_IE_LENGTH_, NULL, &wps_ielen)) + if (rtw_get_wps_ie(pnetwork->network.ies + + _FIXED_IE_LENGTH_, pnetwork->network.ie_length - _FIXED_IE_LENGTH_, + NULL, &wps_ielen)) return true; else return false; - } if (adapter->registrypriv.wifi_spec =3D=3D 1) { /* for correct flow of 8= 021X to do.... */ u8 *p =3D NULL; @@ -601,7 +605,9 @@ int rtw_is_desired_network(struct adapter *adapter, str= uct wlan_network *pnetwor bselected =3D false; =20 if (psecuritypriv->ndisauthtype =3D=3D Ndis802_11AuthModeWPA2PSK) { - p =3D rtw_get_ie(pnetwork->network.ies + _BEACON_IE_OFFSET_, WLAN_EID_R= SN, &ie_len, (pnetwork->network.ie_length - _BEACON_IE_OFFSET_)); + p =3D rtw_get_ie(pnetwork->network.ies + _BEACON_IE_OFFSET_, + WLAN_EID_RSN, &ie_len, + (pnetwork->network.ie_length - _BEACON_IE_OFFSET_)); if (p && ie_len > 0) bselected =3D true; else @@ -613,7 +619,8 @@ int rtw_is_desired_network(struct adapter *adapter, str= uct wlan_network *pnetwor bselected =3D false; =20 if (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) =3D=3D true) { - if (pnetwork->network.infrastructure_mode !=3D pmlmepriv->cur_network.ne= twork.infrastructure_mode) + if (pnetwork->network.infrastructure_mode !=3D + pmlmepriv->cur_network.network.infrastructure_mode) bselected =3D false; } =20 @@ -629,7 +636,7 @@ void rtw_survey_event_callback(struct adapter *adapter,= u8 *pbuf) { u32 len; struct wlan_bssid_ex *pnetwork; - struct mlme_priv *pmlmepriv =3D &(adapter->mlmepriv); + struct mlme_priv *pmlmepriv =3D &adapter->mlmepriv; =20 pnetwork =3D (struct wlan_bssid_ex *)pbuf; =20 @@ -641,18 +648,20 @@ void rtw_survey_event_callback(struct adapter *adapte= r, u8 *pbuf) =20 /* update IBSS_network 's timestamp */ if ((check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE)) =3D=3D true) { - if (!memcmp(&(pmlmepriv->cur_network.network.mac_address), pnetwork->mac= _address, ETH_ALEN)) { + if (!memcmp(&pmlmepriv->cur_network.network.mac_address, + pnetwork->mac_address, ETH_ALEN)) { struct wlan_network *ibss_wlan =3D NULL; =20 memcpy(pmlmepriv->cur_network.network.ies, pnetwork->ies, 8); - spin_lock_bh(&(pmlmepriv->scanned_queue.lock)); - ibss_wlan =3D rtw_find_network(&pmlmepriv->scanned_queue, pnetwork->ma= c_address); + spin_lock_bh(&pmlmepriv->scanned_queue.lock); + ibss_wlan =3D rtw_find_network(&pmlmepriv->scanned_queue, + pnetwork->mac_address); if (ibss_wlan) { memcpy(ibss_wlan->network.ies, pnetwork->ies, 8); - spin_unlock_bh(&(pmlmepriv->scanned_queue.lock)); + spin_unlock_bh(&pmlmepriv->scanned_queue.lock); goto exit; } - spin_unlock_bh(&(pmlmepriv->scanned_queue.lock)); + spin_unlock_bh(&pmlmepriv->scanned_queue.lock); } } =20 @@ -670,7 +679,7 @@ void rtw_survey_event_callback(struct adapter *adapter,= u8 *pbuf) =20 void rtw_surveydone_event_callback(struct adapter *adapter, u8 *pbuf) { - struct mlme_priv *pmlmepriv =3D &(adapter->mlmepriv); + struct mlme_priv *pmlmepriv =3D &adapter->mlmepriv; =20 spin_lock_bh(&pmlmepriv->lock); if (pmlmepriv->wps_probe_req_ie) { @@ -689,7 +698,7 @@ void rtw_surveydone_event_callback(struct adapter *adap= ter, u8 *pbuf) rtw_set_signal_stat_timer(&adapter->recvpriv); =20 if (pmlmepriv->to_join) { - if ((check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) =3D=3D true)) { + if (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) =3D=3D true) { if (check_fwstate(pmlmepriv, _FW_LINKED) =3D=3D false) { set_fwstate(pmlmepriv, _FW_UNDER_LINKING); =20 @@ -697,13 +706,17 @@ void rtw_surveydone_event_callback(struct adapter *ad= apter, u8 *pbuf) _set_timer(&pmlmepriv->assoc_timer, MAX_JOIN_TIMEOUT); } else { u8 ret =3D _SUCCESS; - struct wlan_bssid_ex *pdev_network =3D &(adapter->registrypriv.dev= _network); + struct wlan_bssid_ex *pdev_network =3D + &adapter->registrypriv.dev_network; u8 *pibss =3D adapter->registrypriv.dev_network.mac_address; =20 - /* pmlmepriv->fw_state ^=3D _FW_UNDER_SURVEY;because don't set assoc_= timer */ + /* pmlmepriv->fw_state ^=3D _FW_UNDER_SURVEY; + * because don't set assoc_timer + */ _clr_fwstate_(pmlmepriv, _FW_UNDER_SURVEY); =20 - memcpy(&pdev_network->ssid, &pmlmepriv->assoc_ssid, sizeof(struct ndi= s_802_11_ssid)); + memcpy(&pdev_network->ssid, &pmlmepriv->assoc_ssid, + sizeof(struct ndis_802_11_ssid)); =20 rtw_update_registrypriv_dev_network(adapter); rtw_generate_random_ibss(pibss); @@ -730,29 +743,31 @@ void rtw_surveydone_event_callback(struct adapter *ad= apter, u8 *pbuf) rtw_indicate_connect(adapter); } else { if (rtw_to_roam(adapter) !=3D 0) { - if (rtw_dec_to_roam(adapter) =3D=3D 0 - || _SUCCESS !=3D rtw_sitesurvey_cmd(adapter, &pmlmepriv->assoc_ssid,= 1, NULL, 0) - ) { + if (rtw_dec_to_roam(adapter) =3D=3D 0 || + rtw_sitesurvey_cmd(adapter, + &pmlmepriv->assoc_ssid, + 1, NULL, 0) !=3D _SUCCESS) { rtw_set_to_roam(adapter, 0); rtw_free_assoc_resources(adapter, 1); rtw_indicate_disconnect(adapter); } else { pmlmepriv->to_join =3D true; } - } else + } else { rtw_indicate_disconnect(adapter); + } =20 _clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING); } } } else { if (rtw_chk_roam_flags(adapter, RTW_ROAM_ACTIVE)) { - if (check_fwstate(pmlmepriv, WIFI_STATION_STATE) - && check_fwstate(pmlmepriv, _FW_LINKED)) { - if (rtw_select_roaming_candidate(pmlmepriv) =3D=3D _SUCCESS) { - receive_disconnect(adapter, pmlmepriv->cur_network.network.mac_address - , WLAN_REASON_ACTIVE_ROAM); - } + if (check_fwstate(pmlmepriv, WIFI_STATION_STATE) && + check_fwstate(pmlmepriv, _FW_LINKED) && + rtw_select_roaming_candidate(pmlmepriv) =3D=3D _SUCCESS) { + receive_disconnect(adapter, + pmlmepriv->cur_network.network.mac_address, + WLAN_REASON_ACTIVE_ROAM); } } } @@ -823,8 +838,8 @@ static void find_network(struct adapter *adapter) } =20 /* -*rtw_free_assoc_resources: the caller has to lock pmlmepriv->lock -*/ + *rtw_free_assoc_resources: the caller has to lock pmlmepriv->lock + */ void rtw_free_assoc_resources(struct adapter *adapter, int lock_scanned_qu= eue) { struct mlme_priv *pmlmepriv =3D &adapter->mlmepriv; @@ -832,14 +847,14 @@ void rtw_free_assoc_resources(struct adapter *adapter= , int lock_scanned_queue) struct dvobj_priv *psdpriv =3D adapter->dvobj; struct debug_priv *pdbgpriv =3D &psdpriv->drv_dbg; =20 - if (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_AP_STATE)) { + if (check_fwstate(pmlmepriv, WIFI_STATION_STATE | WIFI_AP_STATE)) { struct sta_info *psta; =20 psta =3D rtw_get_stainfo(&adapter->stapriv, tgt_network->network.mac_add= ress); rtw_free_stainfo(adapter, psta); } =20 - if (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE|WIFI_ADHOC_MASTER_STATE|WIF= I_AP_STATE)) { + if (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE | WIFI_ADHOC_MASTER_STATE |= WIFI_AP_STATE)) { struct sta_info *psta; =20 rtw_free_all_stainfo(adapter); @@ -859,8 +874,8 @@ void rtw_free_assoc_resources(struct adapter *adapter, = int lock_scanned_queue) } =20 /* -*rtw_indicate_connect: the caller has to lock pmlmepriv->lock -*/ + *rtw_indicate_connect: the caller has to lock pmlmepriv->lock + */ void rtw_indicate_connect(struct adapter *padapter) { struct mlme_priv *pmlmepriv =3D &padapter->mlmepriv; @@ -868,7 +883,6 @@ void rtw_indicate_connect(struct adapter *padapter) pmlmepriv->to_join =3D false; =20 if (!check_fwstate(&padapter->mlmepriv, _FW_LINKED)) { - set_fwstate(pmlmepriv, _FW_LINKED); =20 rtw_os_indicate_connect(padapter); @@ -876,23 +890,22 @@ void rtw_indicate_connect(struct adapter *padapter) =20 rtw_set_to_roam(padapter, 0); rtw_set_scan_deny(padapter, 3000); - } =20 /* -*rtw_indicate_disconnect: the caller has to lock pmlmepriv->lock -*/ + *rtw_indicate_disconnect: the caller has to lock pmlmepriv->lock + */ void rtw_indicate_disconnect(struct adapter *padapter) { struct mlme_priv *pmlmepriv =3D &padapter->mlmepriv; =20 - _clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING|WIFI_UNDER_WPS); + _clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING | WIFI_UNDER_WPS); =20 if (rtw_to_roam(padapter) > 0) _clr_fwstate_(pmlmepriv, _FW_LINKED); =20 - if (check_fwstate(&padapter->mlmepriv, _FW_LINKED) - || (rtw_to_roam(padapter) <=3D 0) + if (check_fwstate(&padapter->mlmepriv, _FW_LINKED) || + (rtw_to_roam(padapter) <=3D 0) ) { rtw_os_indicate_disconnect(padapter); =20 @@ -913,7 +926,7 @@ inline void rtw_indicate_scan_done(struct adapter *pada= pter, bool aborted) =20 if ((!adapter_to_pwrctl(padapter)->bInSuspend) && (!check_fwstate(&padapter->mlmepriv, - WIFI_ASOC_STATE|WIFI_UNDER_LINKING))) { + WIFI_ASOC_STATE | WIFI_UNDER_LINKING))) { rtw_set_ips_deny(padapter, 0); _set_timer(&padapter->mlmepriv.dynamic_chk_timer, 1); } @@ -922,14 +935,13 @@ inline void rtw_indicate_scan_done(struct adapter *pa= dapter, bool aborted) void rtw_scan_abort(struct adapter *adapter) { unsigned long start; - struct mlme_priv *pmlmepriv =3D &(adapter->mlmepriv); - struct mlme_ext_priv *pmlmeext =3D &(adapter->mlmeextpriv); + struct mlme_priv *pmlmepriv =3D &adapter->mlmepriv; + struct mlme_ext_priv *pmlmeext =3D &adapter->mlmeextpriv; =20 start =3D jiffies; pmlmeext->scan_abort =3D true; - while (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY) - && jiffies_to_msecs(start) <=3D 200) { - + while (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY) && + jiffies_to_msecs(start) <=3D 200) { if (adapter->bDriverStopped || adapter->bSurpriseRemoved) break; =20 @@ -942,7 +954,8 @@ void rtw_scan_abort(struct adapter *adapter) pmlmeext->scan_abort =3D false; } =20 -static struct sta_info *rtw_joinbss_update_stainfo(struct adapter *padapte= r, struct wlan_network *pnetwork) +static struct sta_info *rtw_joinbss_update_stainfo(struct adapter *padapte= r, + struct wlan_network *pnetwork) { int i; struct sta_info *bmc_sta, *psta =3D NULL; @@ -999,7 +1012,9 @@ static struct sta_info *rtw_joinbss_update_stainfo(str= uct adapter *padapter, str } =20 /* for A-MPDU Rx reordering buffer control for bmc_sta & sta_info */ - /* if A-MPDU Rx is enabled, resetting rx_ordering_ctrl wstart_b(indicat= e_seq) to default value =3D 0xffff */ + /* if A-MPDU Rx is enabled, resetting rx_ordering_ctrl wstart_b(indicate= _seq) + * to default value =3D 0xffff + */ /* todo: check if AP can send A-MPDU packets */ for (i =3D 0; i < 16 ; i++) { preorder_ctrl =3D &psta->recvreorder_ctrl[i]; @@ -1016,21 +1031,23 @@ static struct sta_info *rtw_joinbss_update_stainfo(= struct adapter *padapter, str preorder_ctrl->enable =3D false; preorder_ctrl->indicate_seq =3D 0xffff; preorder_ctrl->wend_b =3D 0xffff; - preorder_ctrl->wsize_b =3D 64;/* max_ampdu_sz;ex. 32(kbytes) -> wsize_= b =3D32 */ + /* max_ampdu_sz;ex. 32(kbytes) -> wsize_b =3D32 */ + preorder_ctrl->wsize_b =3D 64; } } } =20 return psta; - } =20 /* pnetwork : returns from rtw_joinbss_event_callback */ /* ptarget_wlan: found from scanned_queue */ -static void rtw_joinbss_update_network(struct adapter *padapter, struct wl= an_network *ptarget_wlan, struct wlan_network *pnetwork) +static void rtw_joinbss_update_network(struct adapter *padapter, + struct wlan_network *ptarget_wlan, + struct wlan_network *pnetwork) { - struct mlme_priv *pmlmepriv =3D &(padapter->mlmepriv); - struct wlan_network *cur_network =3D &(pmlmepriv->cur_network); + struct mlme_priv *pmlmepriv =3D &padapter->mlmepriv; + struct wlan_network *cur_network =3D &pmlmepriv->cur_network; =20 /* why not use ptarget_wlan?? */ memcpy(&cur_network->network, &pnetwork->network, pnetwork->network.lengt= h); @@ -1044,8 +1061,11 @@ static void rtw_joinbss_update_network(struct adapte= r *padapter, struct wlan_net =20 padapter->recvpriv.signal_strength =3D ptarget_wlan->network.phy_info.sig= nal_strength; padapter->recvpriv.signal_qual =3D ptarget_wlan->network.phy_info.signal_= quality; - /* the ptarget_wlan->network.rssi is raw data, we use ptarget_wlan->netwo= rk.phy_info.signal_strength instead (has scaled) */ - padapter->recvpriv.rssi =3D translate_percentage_to_dbm(ptarget_wlan->net= work.phy_info.signal_strength); + /* the ptarget_wlan->network.rssi is raw data, + * we use ptarget_wlan->network.phy_info.signal_strength instead (has sca= led) + */ + padapter->recvpriv.rssi =3D + translate_percentage_to_dbm(ptarget_wlan->network.phy_info.signal_streng= th); =20 rtw_set_signal_stat_timer(&padapter->recvpriv); =20 @@ -1053,8 +1073,8 @@ static void rtw_joinbss_update_network(struct adapter= *padapter, struct wlan_net switch (pnetwork->network.infrastructure_mode) { case Ndis802_11Infrastructure: =20 - if (pmlmepriv->fw_state&WIFI_UNDER_WPS) - pmlmepriv->fw_state =3D WIFI_STATION_STATE|WIFI_UNDER_WPS; + if (pmlmepriv->fw_state & WIFI_UNDER_WPS) + pmlmepriv->fw_state =3D WIFI_STATION_STATE | WIFI_UNDER_WPS; else pmlmepriv->fw_state =3D WIFI_STATION_STATE; =20 @@ -1067,18 +1087,28 @@ static void rtw_joinbss_update_network(struct adapt= er *padapter, struct wlan_net break; } =20 - rtw_update_protection(padapter, (cur_network->network.ies) + sizeof(struc= t ndis_802_11_fix_ie), - (cur_network->network.ie_length)); + rtw_update_protection(padapter, + (cur_network->network.ies) + sizeof(struct ndis_802_11_fix_ie), + (cur_network->network.ie_length)); =20 - rtw_update_ht_cap(padapter, cur_network->network.ies, cur_network->networ= k.ie_length, (u8) cur_network->network.configuration.ds_config); + rtw_update_ht_cap(padapter, cur_network->network.ies, + cur_network->network.ie_length, + (u8)cur_network->network.configuration.ds_config); } =20 /* Notes: the function could be > passive_level (the same context as Rx ta= sklet) */ /* pnetwork : returns from rtw_joinbss_event_callback */ /* ptarget_wlan: found from scanned_queue */ -/* if join_res > 0, for (fw_state =3D=3DWIFI_STATION_STATE), we check if = "ptarget_sta" & "ptarget_wlan" exist. */ -/* if join_res > 0, for (fw_state =3D=3DWIFI_ADHOC_STATE), we only check i= f "ptarget_wlan" exist. */ -/* if join_res > 0, update "cur_network->network" from "pnetwork->network"= if (ptarget_wlan !=3D NULL). */ +/* if join_res > 0, + * for (fw_state =3D=3D WIFI_STATION_STATE), we check if "ptarget_sta" & = "ptarget_wlan" exist. + */ +/* if join_res > 0, + * for (fw_state =3D=3D WIFI_ADHOC_STATE), we only check if "ptarget_wlan"= exist. + */ +/* if join_res > 0, + * update "cur_network->network" from "pnetwork->network" + * when ptarget_wlan is not NULL. + */ /* */ /* define REJOIN */ void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *pbuf) @@ -1086,15 +1116,16 @@ void rtw_joinbss_event_prehandle(struct adapter *ad= apter, u8 *pbuf) static u8 __maybe_unused retry; struct sta_info *ptarget_sta =3D NULL, *pcur_sta =3D NULL; struct sta_priv *pstapriv =3D &adapter->stapriv; - struct mlme_priv *pmlmepriv =3D &(adapter->mlmepriv); + struct mlme_priv *pmlmepriv =3D &adapter->mlmepriv; struct wlan_network *pnetwork =3D (struct wlan_network *)pbuf; - struct wlan_network *cur_network =3D &(pmlmepriv->cur_network); + struct wlan_network *cur_network =3D &pmlmepriv->cur_network; struct wlan_network *pcur_wlan =3D NULL, *ptarget_wlan =3D NULL; unsigned int the_same_macaddr =3D false; =20 rtw_get_encrypt_decrypt_from_registrypriv(adapter); =20 - the_same_macaddr =3D !memcmp(pnetwork->network.mac_address, cur_network->= network.mac_address, ETH_ALEN); + the_same_macaddr =3D !memcmp(pnetwork->network.mac_address, + cur_network->network.mac_address, ETH_ALEN); =20 pnetwork->network.length =3D get_wlan_bssid_ex_sz(&pnetwork->network); if (pnetwork->network.length > sizeof(struct wlan_bssid_ex)) @@ -1106,7 +1137,7 @@ void rtw_joinbss_event_prehandle(struct adapter *adap= ter, u8 *pbuf) pmlmepriv->LinkDetectInfo.LowPowerTransitionCount =3D 0; =20 if (pnetwork->join_res > 0) { - spin_lock_bh(&(pmlmepriv->scanned_queue.lock)); + spin_lock_bh(&pmlmepriv->scanned_queue.lock); retry =3D 0; if (check_fwstate(pmlmepriv, _FW_UNDER_LINKING)) { /* s1. find ptarget_wlan */ @@ -1130,7 +1161,8 @@ void rtw_joinbss_event_prehandle(struct adapter *adap= ter, u8 *pbuf) } =20 } else { - ptarget_wlan =3D _rtw_find_same_network(&pmlmepriv->scanned_queue, pne= twork); + ptarget_wlan =3D _rtw_find_same_network(&pmlmepriv->scanned_queue, + pnetwork); if (check_fwstate(pmlmepriv, WIFI_STATION_STATE) =3D=3D true) { if (ptarget_wlan) ptarget_wlan->fixed =3D true; @@ -1143,15 +1175,17 @@ void rtw_joinbss_event_prehandle(struct adapter *ad= apter, u8 *pbuf) } else { netdev_dbg(adapter->pnetdev, "Can't find ptarget_wlan when joinbss_event callback\n"); - spin_unlock_bh(&(pmlmepriv->scanned_queue.lock)); + spin_unlock_bh(&pmlmepriv->scanned_queue.lock); goto ignore_joinbss_callback; } =20 - /* s3. find ptarget_sta & update ptarget_sta after update cur_network o= nly for station mode */ + /* s3. find ptarget_sta & update ptarget_sta after update + * cur_network only for station mode + */ if (check_fwstate(pmlmepriv, WIFI_STATION_STATE) =3D=3D true) { ptarget_sta =3D rtw_joinbss_update_stainfo(adapter, pnetwork); if (!ptarget_sta) { - spin_unlock_bh(&(pmlmepriv->scanned_queue.lock)); + spin_unlock_bh(&pmlmepriv->scanned_queue.lock); goto ignore_joinbss_callback; } } @@ -1169,7 +1203,7 @@ void rtw_joinbss_event_prehandle(struct adapter *adap= ter, u8 *pbuf) timer_delete_sync(&pmlmepriv->assoc_timer); spin_lock_bh(&pmlmepriv->lock); } else { - spin_unlock_bh(&(pmlmepriv->scanned_queue.lock)); + spin_unlock_bh(&pmlmepriv->scanned_queue.lock); } } else if (pnetwork->join_res =3D=3D -4) { rtw_reset_securitypriv(adapter); @@ -1226,16 +1260,16 @@ void rtw_sta_media_status_rpt(struct adapter *adapt= er, struct sta_info *psta, u3 if (!psta) return; =20 - media_status_rpt =3D (u16)((psta->mac_id<<8)|mstatus); /* MACID|OPMODE:= 1 connect */ + media_status_rpt =3D (u16)((psta->mac_id << 8) | mstatus); /* MACID|OPM= ODE:1 connect */ rtw_hal_set_hwreg(adapter, HW_VAR_H2C_MEDIA_STATUS_RPT, (u8 *)&media_stat= us_rpt); } =20 void rtw_stassoc_event_callback(struct adapter *adapter, u8 *pbuf) { struct sta_info *psta; - struct mlme_priv *pmlmepriv =3D &(adapter->mlmepriv); + struct mlme_priv *pmlmepriv =3D &adapter->mlmepriv; struct stassoc_event *pstassoc =3D (struct stassoc_event *)pbuf; - struct wlan_network *cur_network =3D &(pmlmepriv->cur_network); + struct wlan_network *cur_network =3D &pmlmepriv->cur_network; struct wlan_network *ptarget_wlan =3D NULL; =20 if (rtw_access_ctrl(adapter, pstassoc->macaddr) =3D=3D false) @@ -1279,8 +1313,10 @@ void rtw_stassoc_event_callback(struct adapter *adap= ter, u8 *pbuf) psta =3D rtw_get_stainfo(&adapter->stapriv, pstassoc->macaddr); if (psta) { /* the sta have been in sta_info_queue =3D> do nothing */ - - return; /* between drv has received this event before and fw have not y= et to set key to CAM_ENTRY) */ + /* between drv has received this event + * before and fw have not yet to set key to CAM_ENTRY) + */ + return; } =20 psta =3D rtw_alloc_stainfo(&adapter->stapriv, pstassoc->macaddr); @@ -1304,14 +1340,15 @@ void rtw_stassoc_event_callback(struct adapter *ada= pter, u8 *pbuf) spin_lock_bh(&pmlmepriv->lock); =20 if ((check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) =3D=3D true) || - (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) =3D=3D true)) { + (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) =3D=3D true)) { if (adapter->stapriv.asoc_sta_count =3D=3D 2) { - spin_lock_bh(&(pmlmepriv->scanned_queue.lock)); - ptarget_wlan =3D rtw_find_network(&pmlmepriv->scanned_queue, cur_networ= k->network.mac_address); + spin_lock_bh(&pmlmepriv->scanned_queue.lock); + ptarget_wlan =3D rtw_find_network(&pmlmepriv->scanned_queue, + cur_network->network.mac_address); pmlmepriv->cur_network_scanned =3D ptarget_wlan; if (ptarget_wlan) ptarget_wlan->fixed =3D true; - spin_unlock_bh(&(pmlmepriv->scanned_queue.lock)); + spin_unlock_bh(&pmlmepriv->scanned_queue.lock); /* a sta + bc/mc_stainfo (not Ibss_stainfo) */ rtw_indicate_connect(adapter); } @@ -1329,11 +1366,11 @@ void rtw_stadel_event_callback(struct adapter *adap= ter, u8 *pbuf) struct wlan_network *pwlan =3D NULL; struct wlan_bssid_ex *pdev_network =3D NULL; u8 *pibss =3D NULL; - struct mlme_priv *pmlmepriv =3D &(adapter->mlmepriv); + struct mlme_priv *pmlmepriv =3D &adapter->mlmepriv; struct stadel_event *pstadel =3D (struct stadel_event *)pbuf; - struct wlan_network *tgt_network =3D &(pmlmepriv->cur_network); + struct wlan_network *tgt_network =3D &pmlmepriv->cur_network; struct mlme_ext_priv *pmlmeext =3D &adapter->mlmeextpriv; - struct mlme_ext_info *pmlmeinfo =3D &(pmlmeext->mlmext_info); + struct mlme_ext_info *pmlmeinfo =3D &pmlmeext->mlmext_info; =20 psta =3D rtw_get_stainfo(&adapter->stapriv, pstadel->macaddr); if (psta) @@ -1344,13 +1381,13 @@ void rtw_stadel_event_callback(struct adapter *adap= ter, u8 *pbuf) if (mac_id >=3D 0) { u16 media_status; =20 - media_status =3D (mac_id<<8)|0; /* MACID|OPMODE:0 means disconnect */ + media_status =3D (mac_id << 8) | 0; /* MACID|OPMODE:0 means disconnect= */ /* for STA, AP, ADHOC mode, report disconnect stauts to FW */ rtw_hal_set_hwreg(adapter, HW_VAR_H2C_MEDIA_STATUS_RPT, (u8 *)&media_sta= tus); } =20 /* if (check_fwstate(pmlmepriv, WIFI_AP_STATE)) */ - if ((pmlmeinfo->state&0x03) =3D=3D WIFI_FW_AP_STATE) + if ((pmlmeinfo->state & 0x03) =3D=3D WIFI_FW_AP_STATE) return; =20 mlmeext_sta_del_event_callback(adapter); @@ -1364,16 +1401,19 @@ void rtw_stadel_event_callback(struct adapter *adap= ter, u8 *pbuf) =20 if (adapter->registrypriv.wifi_spec =3D=3D 1) { roam =3D false; - } else if (reason =3D=3D WLAN_REASON_EXPIRATION_CHK && rtw_chk_roam_flag= s(adapter, RTW_ROAM_ON_EXPIRED)) { + } else if (reason =3D=3D WLAN_REASON_EXPIRATION_CHK && + rtw_chk_roam_flags(adapter, RTW_ROAM_ON_EXPIRED)) { roam =3D true; - } else if (reason =3D=3D WLAN_REASON_ACTIVE_ROAM && rtw_chk_roam_flags(a= dapter, RTW_ROAM_ACTIVE)) { + } else if (reason =3D=3D WLAN_REASON_ACTIVE_ROAM && + rtw_chk_roam_flags(adapter, RTW_ROAM_ACTIVE)) { roam =3D true; roam_target =3D pmlmepriv->roam_network; } =20 if (roam) { if (rtw_to_roam(adapter) > 0) - rtw_dec_to_roam(adapter); /* this stadel_event is caused by roaming, d= ecrease to_roam */ + /* this stadel_event is caused by roaming, decrease to_roam */ + rtw_dec_to_roam(adapter); else if (rtw_to_roam(adapter) =3D=3D 0) rtw_set_to_roam(adapter, adapter->registrypriv.max_roaming_times); } else { @@ -1385,40 +1425,45 @@ void rtw_stadel_event_callback(struct adapter *adap= ter, u8 *pbuf) rtw_free_assoc_resources(adapter, 1); rtw_indicate_disconnect(adapter); =20 - spin_lock_bh(&(pmlmepriv->scanned_queue.lock)); + spin_lock_bh(&pmlmepriv->scanned_queue.lock); /* remove the network entry in scanned_queue */ - pwlan =3D rtw_find_network(&pmlmepriv->scanned_queue, tgt_network->netwo= rk.mac_address); + pwlan =3D rtw_find_network(&pmlmepriv->scanned_queue, + tgt_network->network.mac_address); if (pwlan) { pwlan->fixed =3D false; rtw_free_network_nolock(adapter, pwlan); } - spin_unlock_bh(&(pmlmepriv->scanned_queue.lock)); + spin_unlock_bh(&pmlmepriv->scanned_queue.lock); =20 _rtw_roaming(adapter, roam_target); } =20 if (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) || - check_fwstate(pmlmepriv, WIFI_ADHOC_STATE)) { - + check_fwstate(pmlmepriv, WIFI_ADHOC_STATE)) { rtw_free_stainfo(adapter, psta); =20 - if (adapter->stapriv.asoc_sta_count =3D=3D 1) {/* a sta + bc/mc_stainfo = (not Ibss_stainfo) */ + if (adapter->stapriv.asoc_sta_count =3D=3D 1) { + /* a sta + bc/mc_stainfo (not Ibss_stainfo) */ u8 ret =3D _SUCCESS; - spin_lock_bh(&(pmlmepriv->scanned_queue.lock)); + + spin_lock_bh(&pmlmepriv->scanned_queue.lock); /* free old ibss network */ - pwlan =3D rtw_find_network(&pmlmepriv->scanned_queue, tgt_network->netw= ork.mac_address); + pwlan =3D rtw_find_network(&pmlmepriv->scanned_queue, + tgt_network->network.mac_address); if (pwlan) { pwlan->fixed =3D false; rtw_free_network_nolock(adapter, pwlan); } - spin_unlock_bh(&(pmlmepriv->scanned_queue.lock)); + spin_unlock_bh(&pmlmepriv->scanned_queue.lock); /* re-create ibss */ - pdev_network =3D &(adapter->registrypriv.dev_network); + pdev_network =3D &adapter->registrypriv.dev_network; pibss =3D adapter->registrypriv.dev_network.mac_address; =20 - memcpy(pdev_network, &tgt_network->network, get_wlan_bssid_ex_sz(&tgt_n= etwork->network)); + memcpy(pdev_network, &tgt_network->network, + get_wlan_bssid_ex_sz(&tgt_network->network)); =20 - memcpy(&pdev_network->ssid, &pmlmepriv->assoc_ssid, sizeof(struct ndis_= 802_11_ssid)); + memcpy(&pdev_network->ssid, &pmlmepriv->assoc_ssid, + sizeof(struct ndis_802_11_ssid)); =20 rtw_update_registrypriv_dev_network(adapter); =20 @@ -1433,7 +1478,6 @@ void rtw_stadel_event_callback(struct adapter *adapte= r, u8 *pbuf) if (ret !=3D _SUCCESS) goto unlock; } - } =20 unlock: @@ -1455,9 +1499,9 @@ void rtw_wmm_event_callback(struct adapter *padapter,= u8 *pbuf) } =20 /* -* _rtw_join_timeout_handler - Timeout/failure handler for CMD JoinBss -* @adapter: pointer to struct adapter structure -*/ + * _rtw_join_timeout_handler - Timeout/failure handler for CMD JoinBss + * @adapter: pointer to struct adapter structure + */ void _rtw_join_timeout_handler(struct timer_list *t) { struct adapter *adapter =3D timer_container_of(adapter, t, @@ -1490,18 +1534,19 @@ void _rtw_join_timeout_handler(struct timer_list *t) rtw_indicate_disconnect(adapter); free_scanqueue(pmlmepriv);/* */ =20 - /* indicate disconnect for the case that join_timeout and check_fwstate = !=3D FW_LINKED */ + /* indicate disconnect for the case that join_timeout + * and check_fwstate !=3D FW_LINKED + */ rtw_cfg80211_indicate_disconnect(adapter); - } =20 spin_unlock_bh(&pmlmepriv->lock); } =20 /* -* rtw_scan_timeout_handler - Timeout/Failure handler for CMD SiteSurvey -* @adapter: pointer to struct adapter structure -*/ + * rtw_scan_timeout_handler - Timeout/Failure handler for CMD SiteSurvey + * @adapter: pointer to struct adapter structure + */ void rtw_scan_timeout_handler(struct timer_list *t) { struct adapter *adapter =3D timer_container_of(adapter, t, @@ -1521,17 +1566,18 @@ void rtw_mlme_reset_auto_scan_int(struct adapter *a= dapter) { struct mlme_priv *mlme =3D &adapter->mlmepriv; struct mlme_ext_priv *pmlmeext =3D &adapter->mlmeextpriv; - struct mlme_ext_info *pmlmeinfo =3D &(pmlmeext->mlmext_info); + struct mlme_ext_info *pmlmeinfo =3D &pmlmeext->mlmext_info; =20 - if (pmlmeinfo->VHT_enable) /* disable auto scan when connect to 11AC AP */ + if (pmlmeinfo->VHT_enable) { /* disable auto scan when connect to 11AC AP= */ mlme->auto_scan_int_ms =3D 0; - else if (adapter->registrypriv.wifi_spec && is_client_associated_to_ap(ad= apter) =3D=3D true) - mlme->auto_scan_int_ms =3D 60*1000; - else if (rtw_chk_roam_flags(adapter, RTW_ROAM_ACTIVE)) { + } else if (adapter->registrypriv.wifi_spec && is_client_associated_to_ap(= adapter) =3D=3D true) { + mlme->auto_scan_int_ms =3D 60 * 1000; + } else if (rtw_chk_roam_flags(adapter, RTW_ROAM_ACTIVE)) { if (check_fwstate(mlme, WIFI_STATION_STATE) && check_fwstate(mlme, _FW_L= INKED)) mlme->auto_scan_int_ms =3D mlme->roam_scan_int_ms; - } else + } else { mlme->auto_scan_int_ms =3D 0; /* disabled */ + } } =20 static void rtw_auto_scan_handler(struct adapter *padapter) @@ -1540,9 +1586,8 @@ static void rtw_auto_scan_handler(struct adapter *pad= apter) =20 rtw_mlme_reset_auto_scan_int(padapter); =20 - if (pmlmepriv->auto_scan_int_ms !=3D 0 - && jiffies_to_msecs(jiffies - pmlmepriv->scan_start_time) > pmlmepriv->a= uto_scan_int_ms) { - + if (pmlmepriv->auto_scan_int_ms !=3D 0 && + jiffies_to_msecs(jiffies - pmlmepriv->scan_start_time) > pmlmepriv->a= uto_scan_int_ms) { if (!padapter->registrypriv.wifi_spec) { if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY | _FW_UNDER_LINKING) =3D= =3D true) goto exit; @@ -1572,8 +1617,8 @@ void rtw_dynamic_check_timer_handler(struct adapter *= adapter) if (adapter->net_closed) return; =20 - if ((adapter_to_pwrctl(adapter)->fw_current_in_ps_mode) - && !(hal_btcoex_IsBtControlLps(adapter)) + if ((adapter_to_pwrctl(adapter)->fw_current_in_ps_mode) && + !(hal_btcoex_IsBtControlLps(adapter)) ) { u8 bEnterPS; =20 @@ -1584,7 +1629,9 @@ void rtw_dynamic_check_timer_handler(struct adapter *= adapter) /* rtw_lps_ctrl_wk_cmd(adapter, LPS_CTRL_ENTER, 1); */ rtw_hal_dm_watchdog_in_lps(adapter); } else { - /* call rtw_lps_ctrl_wk_cmd(padapter, LPS_CTRL_LEAVE, 1) in traffic_sta= tus_watchdog() */ + /* call rtw_lps_ctrl_wk_cmd(padapter, LPS_CTRL_LEAVE, 1) + * in traffic_status_watchdog() + */ } =20 } else { @@ -1618,10 +1665,10 @@ void rtw_set_scan_deny(struct adapter *adapter, u32= ms) } =20 /* -* Select a new roaming candidate from the original @param candidate and @p= aram competitor -* @return true: candidate is updated -* @return false: candidate is not updated -*/ + * Select a new roaming candidate from the original @param candidate and @= param competitor + * @return true: candidate is updated + * @return false: candidate is not updated + */ static int rtw_check_roaming_candidate(struct mlme_priv *mlme , struct wlan_network **candidate, struct wlan_network *competitor) { @@ -1644,7 +1691,8 @@ static int rtw_check_roaming_candidate(struct mlme_pr= iv *mlme if (jiffies_to_msecs(jiffies - competitor->last_scanned) >=3D mlme->roam_= scanr_exp_ms) goto exit; =20 - if (competitor->network.rssi - mlme->cur_network_scanned->network.rssi < = mlme->roam_rssi_diff_th) + if (competitor->network.rssi - mlme->cur_network_scanned->network.rssi < + mlme->roam_rssi_diff_th) goto exit; =20 if (*candidate && (*candidate)->network.rssi >=3D competitor->network.rss= i) @@ -1662,7 +1710,7 @@ int rtw_select_roaming_candidate(struct mlme_priv *ml= me) { int ret =3D _FAIL; struct list_head *phead; - struct __queue *queue =3D &(mlme->scanned_queue); + struct __queue *queue =3D &mlme->scanned_queue; struct wlan_network *pnetwork =3D NULL; struct wlan_network *candidate =3D NULL; =20 @@ -1671,16 +1719,14 @@ int rtw_select_roaming_candidate(struct mlme_priv *= mlme) return ret; } =20 - spin_lock_bh(&(mlme->scanned_queue.lock)); + spin_lock_bh(&mlme->scanned_queue.lock); phead =3D get_list_head(queue); =20 list_for_each(mlme->pscanned, phead) { - pnetwork =3D list_entry(mlme->pscanned, struct wlan_network, list); =20 rtw_check_roaming_candidate(mlme, &candidate, pnetwork); - } =20 if (!candidate) { @@ -1695,16 +1741,16 @@ int rtw_select_roaming_candidate(struct mlme_priv *= mlme) =20 ret =3D _SUCCESS; exit: - spin_unlock_bh(&(mlme->scanned_queue.lock)); + spin_unlock_bh(&mlme->scanned_queue.lock); =20 return ret; } =20 /* -* Select a new join candidate from the original @param candidate and @para= m competitor -* @return true: candidate is updated -* @return false: candidate is not updated -*/ + * Select a new join candidate from the original @param candidate and @par= am competitor + * @return true: candidate is updated + * @return false: candidate is not updated + */ static int rtw_check_join_candidate(struct mlme_priv *mlme , struct wlan_network **candidate, struct wlan_network *competitor) { @@ -1719,8 +1765,9 @@ static int rtw_check_join_candidate(struct mlme_priv = *mlme =20 /* check ssid, if needed */ if (mlme->assoc_ssid.ssid[0] && mlme->assoc_ssid.ssid_length) { - if (competitor->network.ssid.ssid_length !=3D mlme->assoc_ssid.ssid_leng= th - || memcmp(competitor->network.ssid.ssid, mlme->assoc_ssid.ssid, mlme->a= ssoc_ssid.ssid_length) + if (competitor->network.ssid.ssid_length !=3D mlme->assoc_ssid.ssid_leng= th || + memcmp(competitor->network.ssid.ssid, mlme->assoc_ssid.ssid, + mlme->assoc_ssid.ssid_length) ) goto exit; } @@ -1729,8 +1776,9 @@ static int rtw_check_join_candidate(struct mlme_priv = *mlme goto exit; =20 if (rtw_to_roam(adapter) > 0) { - if (jiffies_to_msecs(jiffies - competitor->last_scanned) >=3D mlme->roam= _scanr_exp_ms - || is_same_ess(&competitor->network, &mlme->cur_network.network) =3D=3D= false + if (jiffies_to_msecs(jiffies - competitor->last_scanned) >=3D + mlme->roam_scanr_exp_ms || is_same_ess(&competitor->network, + &mlme->cur_network.network) =3D=3D false ) goto exit; } @@ -1745,24 +1793,24 @@ static int rtw_check_join_candidate(struct mlme_pri= v *mlme } =20 /* -Calling context: -The caller of the sub-routine will be in critical section... -The caller must hold the following spinlock -pmlmepriv->lock -*/ + * Calling context: + * The caller of the sub-routine will be in critical section... + * The caller must hold the following spinlock + * pmlmepriv->lock + */ =20 int rtw_select_and_join_from_scanned_queue(struct mlme_priv *pmlmepriv) { int ret; struct list_head *phead; struct adapter *adapter; - struct __queue *queue =3D &(pmlmepriv->scanned_queue); + struct __queue *queue =3D &pmlmepriv->scanned_queue; struct wlan_network *pnetwork =3D NULL; struct wlan_network *candidate =3D NULL; =20 adapter =3D (struct adapter *)pmlmepriv->nic_hdl; =20 - spin_lock_bh(&(pmlmepriv->scanned_queue.lock)); + spin_lock_bh(&pmlmepriv->scanned_queue.lock); =20 if (pmlmepriv->roam_network) { candidate =3D pmlmepriv->roam_network; @@ -1772,12 +1820,10 @@ int rtw_select_and_join_from_scanned_queue(struct m= lme_priv *pmlmepriv) =20 phead =3D get_list_head(queue); list_for_each(pmlmepriv->pscanned, phead) { - pnetwork =3D list_entry(pmlmepriv->pscanned, struct wlan_network, list); =20 rtw_check_join_candidate(pmlmepriv, &candidate, pnetwork); - } =20 if (!candidate) { @@ -1800,7 +1846,7 @@ int rtw_select_and_join_from_scanned_queue(struct mlm= e_priv *pmlmepriv) ret =3D rtw_joinbss_cmd(adapter, candidate); =20 exit: - spin_unlock_bh(&(pmlmepriv->scanned_queue.lock)); + spin_unlock_bh(&pmlmepriv->scanned_queue.lock); return ret; } =20 @@ -1808,7 +1854,7 @@ signed int rtw_set_auth(struct adapter *adapter, stru= ct security_priv *psecurity { struct cmd_obj *pcmd; struct setauth_parm *psetauthparm; - struct cmd_priv *pcmdpriv =3D &(adapter->cmdpriv); + struct cmd_priv *pcmdpriv =3D &adapter->cmdpriv; signed int res =3D _SUCCESS; =20 pcmd =3D rtw_zmalloc(sizeof(struct cmd_obj)); @@ -1840,12 +1886,13 @@ signed int rtw_set_auth(struct adapter *adapter, st= ruct security_priv *psecurity return res; } =20 -signed int rtw_set_key(struct adapter *adapter, struct security_priv *psec= uritypriv, signed int keyid, u8 set_tx, bool enqueue) +signed int rtw_set_key(struct adapter *adapter, struct security_priv *psec= uritypriv, + signed int keyid, u8 set_tx, bool enqueue) { u8 keylen; struct cmd_obj *pcmd; struct setkey_parm *psetkeyparm; - struct cmd_priv *pcmdpriv =3D &(adapter->cmdpriv); + struct cmd_priv *pcmdpriv =3D &adapter->cmdpriv; signed int res =3D _SUCCESS; =20 psetkeyparm =3D rtw_zmalloc(sizeof(struct setkey_parm)); @@ -1865,14 +1912,13 @@ signed int rtw_set_key(struct adapter *adapter, str= uct security_priv *psecurityp adapter->securitypriv.key_mask |=3D BIT(psetkeyparm->keyid); =20 switch (psetkeyparm->algorithm) { - case _WEP40_: keylen =3D 5; - memcpy(&(psetkeyparm->key[0]), &(psecuritypriv->dot11DefKey[keyid].skey[= 0]), keylen); + memcpy(&psetkeyparm->key[0], &psecuritypriv->dot11DefKey[keyid].skey[0],= keylen); break; case _WEP104_: keylen =3D 13; - memcpy(&(psetkeyparm->key[0]), &(psecuritypriv->dot11DefKey[keyid].skey[= 0]), keylen); + memcpy(&psetkeyparm->key[0], &psecuritypriv->dot11DefKey[keyid].skey[0],= keylen); break; case _TKIP_: keylen =3D 16; @@ -1916,7 +1962,8 @@ signed int rtw_set_key(struct adapter *adapter, struc= t security_priv *psecurityp } =20 /* adjust ies for rtw_joinbss_cmd in WMM */ -int rtw_restruct_wmm_ie(struct adapter *adapter, u8 *in_ie, u8 *out_ie, ui= nt in_len, uint initial_out_len) +int rtw_restruct_wmm_ie(struct adapter *adapter, u8 *in_ie, u8 *out_ie, + uint in_len, uint initial_out_len) { unsigned int ielength =3D 0; unsigned int i, j; @@ -1925,7 +1972,10 @@ int rtw_restruct_wmm_ie(struct adapter *adapter, u8 = *in_ie, u8 *out_ie, uint in_ while (i < in_len) { ielength =3D initial_out_len; =20 - if (in_ie[i] =3D=3D 0xDD && in_ie[i+2] =3D=3D 0x00 && in_ie[i+3] =3D=3D = 0x50 && in_ie[i+4] =3D=3D 0xF2 && in_ie[i+5] =3D=3D 0x02 && i+5 < in_len) = { /* WMM element ID and OUI */ + if (in_ie[i] =3D=3D 0xDD && in_ie[i + 2] =3D=3D 0x00 && + in_ie[i + 3] =3D=3D 0x50 && in_ie[i + 4] =3D=3D 0xF2 && + in_ie[i + 5] =3D=3D 0x02 && i + 5 < in_len) { + /* WMM element ID and OUI */ for (j =3D i; j < i + 9; j++) { out_ie[ielength] =3D in_ie[j]; ielength++; @@ -1937,11 +1987,10 @@ int rtw_restruct_wmm_ie(struct adapter *adapter, u8= *in_ie, u8 *out_ie, uint in_ break; } =20 - i +=3D (in_ie[i+1]+2); /* to the next IE element */ + i +=3D (in_ie[i + 1] + 2); /* to the next IE element */ } =20 return ielength; - } =20 /* */ @@ -1950,8 +1999,8 @@ int rtw_restruct_wmm_ie(struct adapter *adapter, u8 *= in_ie, u8 *out_ie, uint in_ /* */ /* Search by BSSID, */ /* Return Value: */ -/* -1 :if there is no pre-auth key in the table */ -/* >=3D 0 :if there is pre-auth key, and return the entry id */ +/* -1 :if there is no pre-auth key in the table */ +/* >=3D 0 :if there is pre-auth key, and return the entry id */ /* */ /* */ =20 @@ -1962,7 +2011,7 @@ static int SecIsInPMKIDList(struct adapter *Adapter, = u8 *bssid) =20 for (i =3D 0; i < NUM_PMKID_CACHE; i++) if ((p->PMKIDList[i].bUsed) && - (!memcmp(p->PMKIDList[i].Bssid, bssid, ETH_ALEN))) + (!memcmp(p->PMKIDList[i].Bssid, bssid, ETH_ALEN))) return i; return -1; } @@ -2011,13 +2060,14 @@ signed int rtw_restruct_sec_ie(struct adapter *adap= ter, u8 *in_ie, u8 *out_ie, u authmode =3D WLAN_EID_RSN; =20 if (check_fwstate(pmlmepriv, WIFI_UNDER_WPS)) { - memcpy(out_ie+ielength, psecuritypriv->wps_ie, psecuritypriv->wps_ie_len= ); + memcpy(out_ie + ielength, psecuritypriv->wps_ie, psecuritypriv->wps_ie_l= en); =20 ielength +=3D psecuritypriv->wps_ie_len; } else if ((authmode =3D=3D WLAN_EID_VENDOR_SPECIFIC) || (authmode =3D=3D= WLAN_EID_RSN)) { /* copy RSN or SSN */ - memcpy(&out_ie[ielength], &psecuritypriv->supplicant_ie[0], psecuritypri= v->supplicant_ie[1]+2); - ielength +=3D psecuritypriv->supplicant_ie[1]+2; + memcpy(&out_ie[ielength], &psecuritypriv->supplicant_ie[0], + psecuritypriv->supplicant_ie[1] + 2); + ielength +=3D psecuritypriv->supplicant_ie[1] + 2; rtw_report_sec_ie(adapter, authmode, psecuritypriv->supplicant_ie); } =20 @@ -2054,7 +2104,8 @@ void rtw_update_registrypriv_dev_network(struct adapt= er *adapter) struct security_priv *psecuritypriv =3D &adapter->securitypriv; struct wlan_network *cur_network =3D &adapter->mlmepriv.cur_network; =20 - pdev_network->privacy =3D (psecuritypriv->dot11PrivacyAlgrthm > 0 ? 1 : 0= ) ; /* adhoc no 802.1x */ + pdev_network->privacy =3D + (psecuritypriv->dot11PrivacyAlgrthm > 0 ? 1 : 0) ; /* adhoc no 802.1x */ =20 pdev_network->rssi =3D 0; =20 @@ -2084,14 +2135,18 @@ void rtw_update_registrypriv_dev_network(struct ada= pter *adapter) /* 1. Supported rates */ /* 2. IE */ =20 - /* rtw_set_supported_rate(pdev_network->supported_rates, pregistrypriv->w= ireless_mode) ; will be called in rtw_generate_ie */ + /* rtw_set_supported_rate(pdev_network->supported_rates, pregistrypriv->w= ireless_mode); + * will be called in rtw_generate_ie + */ sz =3D rtw_generate_ie(pregistrypriv); =20 pdev_network->ie_length =3D sz; =20 pdev_network->length =3D get_wlan_bssid_ex_sz((struct wlan_bssid_ex *)pd= ev_network); =20 - /* notes: translate ie_length & length after assign the length to cmdsz i= n createbss_cmd(); */ + /* notes: translate ie_length & length after + * assign the length to cmdsz in createbss_cmd(); + */ /* pdev_network->ie_length =3D cpu_to_le32(sz); */ } =20 @@ -2105,9 +2160,12 @@ void rtw_joinbss_reset(struct adapter *padapter) u8 threshold; struct mlme_priv *pmlmepriv =3D &padapter->mlmepriv; =20 - struct ht_priv *phtpriv =3D &pmlmepriv->htpriv; + struct ht_priv *phtpriv =3D &pmlmepriv->htpriv; =20 - /* todo: if you want to do something io/reg/hw setting before join_bss, p= lease add code here */ + /* + * todo: if you want to do something io/reg/hw setting + * before join_bss, please add code here + */ =20 pmlmepriv->num_FortyMHzIntolerant =3D 0; =20 @@ -2131,8 +2189,8 @@ void rtw_joinbss_reset(struct adapter *padapter) =20 void rtw_ht_use_default_setting(struct adapter *padapter) { - struct mlme_priv *pmlmepriv =3D &padapter->mlmepriv; - struct ht_priv *phtpriv =3D &pmlmepriv->htpriv; + struct mlme_priv *pmlmepriv =3D &padapter->mlmepriv; + struct ht_priv *phtpriv =3D &pmlmepriv->htpriv; struct registry_priv *pregistrypriv =3D &padapter->registrypriv; bool bHwLDPCSupport =3D false, bHwSTBCSupport =3D false; bool bHwSupportBeamformer =3D false, bHwSupportBeamformee =3D false; @@ -2189,7 +2247,7 @@ void rtw_build_wmm_ie_ht(struct adapter *padapter, u8= *out_ie, uint *pout_len) =20 if (padapter->mlmepriv.qospriv.qos_option =3D=3D 0) { out_len =3D *pout_len; - rtw_set_ie(out_ie+out_len, WLAN_EID_VENDOR_SPECIFIC, + rtw_set_ie(out_ie + out_len, WLAN_EID_VENDOR_SPECIFIC, _WMM_IE_Length_, WMM_IE, pout_len); =20 padapter->mlmepriv.qospriv.qos_option =3D 1; @@ -2197,7 +2255,8 @@ void rtw_build_wmm_ie_ht(struct adapter *padapter, u8= *out_ie, uint *pout_len) } =20 /* the function is >=3D passive_level */ -unsigned int rtw_restructure_ht_ie(struct adapter *padapter, u8 *in_ie, u8= *out_ie, uint in_len, uint *pout_len, u8 channel) +unsigned int rtw_restructure_ht_ie(struct adapter *padapter, u8 *in_ie, + u8 *out_ie, uint in_len, uint *pout_len, u8 channel) { u32 ielen, out_len; enum ieee80211_max_ampdu_length_exp max_rx_ampdu_factor; @@ -2206,7 +2265,7 @@ unsigned int rtw_restructure_ht_ie(struct adapter *pa= dapter, u8 *in_ie, u8 *out_ u8 cbw40_enable =3D 0, stbc_rx_enable =3D 0, operation_bw =3D 0; struct registry_priv *pregistrypriv =3D &padapter->registrypriv; struct mlme_priv *pmlmepriv =3D &padapter->mlmepriv; - struct ht_priv *phtpriv =3D &pmlmepriv->htpriv; + struct ht_priv *phtpriv =3D &pmlmepriv->htpriv; struct mlme_ext_priv *pmlmeext =3D &padapter->mlmeextpriv; =20 phtpriv->ht_option =3D false; @@ -2227,13 +2286,14 @@ unsigned int rtw_restructure_ht_ie(struct adapter *= padapter, u8 *in_ie, u8 *out_ operation_bw =3D padapter->mlmeextpriv.cur_bwmode; if (operation_bw > CHANNEL_WIDTH_40) operation_bw =3D CHANNEL_WIDTH_40; - } else + } else { /* TDLS: TODO 40? */ operation_bw =3D CHANNEL_WIDTH_40; + } } else { p =3D rtw_get_ie(in_ie, WLAN_EID_HT_OPERATION, &ielen, in_len); if (p && (ielen =3D=3D sizeof(struct ieee80211_ht_addt_info))) { - struct HT_info_element *pht_info =3D (struct HT_info_element *)(p+2); + struct HT_info_element *pht_info =3D (struct HT_info_element *)(p + 2); =20 if (pht_info->infos[0] & BIT(2)) { switch (pht_info->infos[0] & 0x3) { @@ -2283,7 +2343,8 @@ unsigned int rtw_restructure_ht_ie(struct adapter *pa= dapter, u8 *in_ie, u8 *out_ =20 /* update default supported_mcs_set */ if (stbc_rx_enable) - ht_capie.cap_info |=3D cpu_to_le16(IEEE80211_HT_CAP_RX_STBC_1R);/* RX ST= BC One spatial stream */ + ht_capie.cap_info |=3D + cpu_to_le16(IEEE80211_HT_CAP_RX_STBC_1R);/* RX STBC One spatial stream = */ =20 set_mcs_rate_by_mask(ht_capie.mcs.rx_mask, MCS_RATE_1R); =20 @@ -2301,14 +2362,14 @@ unsigned int rtw_restructure_ht_ie(struct adapter *= padapter, u8 *in_ie, u8 *out_ rtw_hal_get_def_var(padapter, HW_VAR_MAX_RX_AMPDU_FACTOR, &max_rx_ampdu_factor); =20 - ht_capie.ampdu_params_info =3D (max_rx_ampdu_factor&0x03); + ht_capie.ampdu_params_info =3D (max_rx_ampdu_factor & 0x03); =20 if (padapter->securitypriv.dot11PrivacyAlgrthm =3D=3D _AES_) - ht_capie.ampdu_params_info |=3D (IEEE80211_HT_CAP_AMPDU_DENSITY&(0x07<<2= )); + ht_capie.ampdu_params_info |=3D (IEEE80211_HT_CAP_AMPDU_DENSITY & (0x07 = << 2)); else - ht_capie.ampdu_params_info |=3D (IEEE80211_HT_CAP_AMPDU_DENSITY&0x00); + ht_capie.ampdu_params_info |=3D (IEEE80211_HT_CAP_AMPDU_DENSITY & 0x00); =20 - rtw_set_ie(out_ie+out_len, WLAN_EID_HT_CAPABILITY, + rtw_set_ie(out_ie + out_len, WLAN_EID_HT_CAPABILITY, sizeof(struct ieee80211_ht_cap), (unsigned char *)&ht_capie, pout_len= ); =20 phtpriv->ht_option =3D true; @@ -2317,12 +2378,11 @@ unsigned int rtw_restructure_ht_ie(struct adapter *= padapter, u8 *in_ie, u8 *out_ p =3D rtw_get_ie(in_ie, WLAN_EID_HT_OPERATION, &ielen, in_len); if (p && (ielen =3D=3D sizeof(struct ieee80211_ht_addt_info))) { out_len =3D *pout_len; - rtw_set_ie(out_ie+out_len, WLAN_EID_HT_OPERATION, ielen, p+2, pout_len); + rtw_set_ie(out_ie + out_len, WLAN_EID_HT_OPERATION, ielen, p + 2, pout_= len); } } =20 return phtpriv->ht_option; - } =20 /* the function is > passive_level (in critical_section) */ @@ -2332,10 +2392,10 @@ void rtw_update_ht_cap(struct adapter *padapter, u8= *pie, uint ie_len, u8 channe int len; struct ieee80211_ht_cap *pht_capie; struct mlme_priv *pmlmepriv =3D &padapter->mlmepriv; - struct ht_priv *phtpriv =3D &pmlmepriv->htpriv; + struct ht_priv *phtpriv =3D &pmlmepriv->htpriv; struct registry_priv *pregistrypriv =3D &padapter->registrypriv; struct mlme_ext_priv *pmlmeext =3D &padapter->mlmeextpriv; - struct mlme_ext_info *pmlmeinfo =3D &(pmlmeext->mlmext_info); + struct mlme_ext_info *pmlmeinfo =3D &pmlmeext->mlmext_info; u8 cbw40_enable =3D 0; =20 if (!phtpriv->ht_option) @@ -2350,22 +2410,22 @@ void rtw_update_ht_cap(struct adapter *padapter, u8= *pie, uint ie_len, u8 channe =20 /* check Max Rx A-MPDU Size */ len =3D 0; - p =3D rtw_get_ie(pie+sizeof(struct ndis_802_11_fix_ie), WLAN_EID_HT_CAPAB= ILITY, &len, ie_len-sizeof(struct ndis_802_11_fix_ie)); + p =3D rtw_get_ie(pie + sizeof(struct ndis_802_11_fix_ie), WLAN_EID_HT_CAP= ABILITY, + &len, ie_len - sizeof(struct ndis_802_11_fix_ie)); if (p && len > 0) { - pht_capie =3D (struct ieee80211_ht_cap *)(p+2); + pht_capie =3D (struct ieee80211_ht_cap *)(p + 2); max_ampdu_sz =3D (pht_capie->ampdu_params_info & IEEE80211_HT_CAP_AMPDU_= FACTOR); - max_ampdu_sz =3D 1 << (max_ampdu_sz+3); /* max_ampdu_sz (kbytes); */ + max_ampdu_sz =3D 1 << (max_ampdu_sz + 3); /* max_ampdu_sz (kbytes); */ =20 phtpriv->rx_ampdu_maxlen =3D max_ampdu_sz; - } =20 len =3D 0; - p =3D rtw_get_ie(pie+sizeof(struct ndis_802_11_fix_ie), WLAN_EID_HT_OPERA= TION, &len, ie_len-sizeof(struct ndis_802_11_fix_ie)); + p =3D rtw_get_ie(pie + sizeof(struct ndis_802_11_fix_ie), WLAN_EID_HT_OPE= RATION, + &len, ie_len - sizeof(struct ndis_802_11_fix_ie)); if (p && len > 0) { /* todo: */ } - if (channel > 14) { if ((pregistrypriv->bw_mode & 0xf0) > 0) cbw40_enable =3D 1; @@ -2382,7 +2442,8 @@ void rtw_update_ht_cap(struct adapter *padapter, u8 *= pie, uint ie_len, u8 channe =20 /* update the MCS set */ for (i =3D 0; i < 16; i++) - pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate[i] &=3D pmlmeext->default_= supported_mcs_set[i]; + pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate[i] &=3D + pmlmeext->default_supported_mcs_set[i]; =20 /* update the MCS rates */ set_mcs_rate_by_mask(pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate, MCS_R= ATE_1R); @@ -2445,21 +2506,20 @@ void rtw_issue_addbareq_cmd(struct adapter *padapte= r, struct xmit_frame *pxmitfr phtpriv =3D &psta->htpriv; =20 if (phtpriv->ht_option && phtpriv->ampdu_enable) { - issued =3D (phtpriv->agg_enable_bitmap>>priority)&0x1; - issued |=3D (phtpriv->candidate_tid_bitmap>>priority)&0x1; + issued =3D (phtpriv->agg_enable_bitmap >> priority) & 0x1; + issued |=3D (phtpriv->candidate_tid_bitmap >> priority) & 0x1; =20 if (issued =3D=3D 0) { psta->htpriv.candidate_tid_bitmap |=3D BIT((u8)priority); - rtw_addbareq_cmd(padapter, (u8) priority, pattrib->ra); + rtw_addbareq_cmd(padapter, (u8)priority, pattrib->ra); } } - } =20 void rtw_append_exented_cap(struct adapter *padapter, u8 *out_ie, uint *po= ut_len) { struct mlme_priv *pmlmepriv =3D &padapter->mlmepriv; - struct ht_priv *phtpriv =3D &pmlmepriv->htpriv; + struct ht_priv *phtpriv =3D &pmlmepriv->htpriv; u8 cap_content[8] =3D {0}; =20 if (phtpriv->bss_coexist) @@ -2494,13 +2554,15 @@ void rtw_roaming(struct adapter *padapter, struct w= lan_network *tgt_network) _rtw_roaming(padapter, tgt_network); spin_unlock_bh(&pmlmepriv->lock); } + void _rtw_roaming(struct adapter *padapter, struct wlan_network *tgt_netwo= rk) { struct mlme_priv *pmlmepriv =3D &padapter->mlmepriv; struct wlan_network *cur_network =3D &pmlmepriv->cur_network; =20 if (rtw_to_roam(padapter) > 0) { - memcpy(&pmlmepriv->assoc_ssid, &cur_network->network.ssid, sizeof(struct= ndis_802_11_ssid)); + memcpy(&pmlmepriv->assoc_ssid, &cur_network->network.ssid, + sizeof(struct ndis_802_11_ssid)); =20 pmlmepriv->assoc_by_bssid =3D false; =20 @@ -2517,7 +2579,8 @@ void _rtw_roaming(struct adapter *padapter, struct wl= an_network *tgt_network) signed int rtw_linked_check(struct adapter *padapter) { if ((check_fwstate(&padapter->mlmepriv, WIFI_AP_STATE) =3D=3D true) || - (check_fwstate(&padapter->mlmepriv, WIFI_ADHOC_STATE|WIFI_ADHOC_MASTER_= STATE) =3D=3D true)) { + (check_fwstate(&padapter->mlmepriv, WIFI_ADHOC_STATE | + WIFI_ADHOC_MASTER_STATE) =3D=3D true)) { if (padapter->stapriv.asoc_sta_count > 2) return true; } else { /* Station mode */ --=20 2.39.5