UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: rtl8723bs: clean up open braces 

Move braces to fix coding style issues and clear checkpatch errors.
Some braces are removed for single statements.

ERROR: open brace '{' following function definitions go on the next line
ERROR: that open brace { should be on the previous line

Signed-off-by: Ross Schmidt <ross.schm.dev@gmail.com>
Link: https://lore.kernel.org/r/20201110041008.15847-5-ross.schm.dev@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Ross Schmidt 2020-11-09 22:10:03 -06:00 committed by Greg Kroah-Hartman
parent 5641eeec0f
commit fa7c458672
1 changed files with 54 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

167
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
View File

@ -1746,8 +1746,7 @@ static int rtw_cfg80211_set_cipher(struct security_priv *psecuritypriv, u32 ciph
return -ENOTSUPP; return -ENOTSUPP;
} }
if (ucast) if (ucast) {
{
psecuritypriv->ndisencryptstatus = ndisencryptstatus; psecuritypriv->ndisencryptstatus = ndisencryptstatus;
/* if (psecuritypriv->dot11PrivacyAlgrthm >= _AES_) */ /* if (psecuritypriv->dot11PrivacyAlgrthm >= _AES_) */
@ -1819,10 +1818,8 @@ static int rtw_cfg80211_set_wpa_ie(struct adapter *padapter, u8 *pie, size_t iel
} }
pwpa = rtw_get_wpa_ie(buf, &wpa_ielen, ielen); pwpa = rtw_get_wpa_ie(buf, &wpa_ielen, ielen);
if (pwpa && wpa_ielen > 0) if (pwpa && wpa_ielen > 0) {
{ if (rtw_parse_wpa_ie(pwpa, wpa_ielen+2, &group_cipher, &pairwise_cipher, NULL) == _SUCCESS) {
if (rtw_parse_wpa_ie(pwpa, wpa_ielen+2, &group_cipher, &pairwise_cipher, NULL) == _SUCCESS)
{
padapter->securitypriv.dot11AuthAlgrthm = dot11AuthAlgrthm_8021X; padapter->securitypriv.dot11AuthAlgrthm = dot11AuthAlgrthm_8021X;
padapter->securitypriv.ndisauthtype = Ndis802_11AuthModeWPAPSK; padapter->securitypriv.ndisauthtype = Ndis802_11AuthModeWPAPSK;
memcpy(padapter->securitypriv.supplicant_ie, &pwpa[0], wpa_ielen+2); memcpy(padapter->securitypriv.supplicant_ie, &pwpa[0], wpa_ielen+2);
@ -1832,10 +1829,8 @@ static int rtw_cfg80211_set_wpa_ie(struct adapter *padapter, u8 *pie, size_t iel
} }
pwpa2 = rtw_get_wpa2_ie(buf, &wpa2_ielen, ielen); pwpa2 = rtw_get_wpa2_ie(buf, &wpa2_ielen, ielen);
if (pwpa2 && wpa2_ielen > 0) if (pwpa2 && wpa2_ielen > 0) {
{ if (rtw_parse_wpa2_ie(pwpa2, wpa2_ielen+2, &group_cipher, &pairwise_cipher, NULL) == _SUCCESS) {
if (rtw_parse_wpa2_ie(pwpa2, wpa2_ielen+2, &group_cipher, &pairwise_cipher, NULL) == _SUCCESS)
{
padapter->securitypriv.dot11AuthAlgrthm = dot11AuthAlgrthm_8021X; padapter->securitypriv.dot11AuthAlgrthm = dot11AuthAlgrthm_8021X;
padapter->securitypriv.ndisauthtype = Ndis802_11AuthModeWPA2PSK; padapter->securitypriv.ndisauthtype = Ndis802_11AuthModeWPA2PSK;
memcpy(padapter->securitypriv.supplicant_ie, &pwpa2[0], wpa2_ielen+2); memcpy(padapter->securitypriv.supplicant_ie, &pwpa2[0], wpa2_ielen+2);
@ -1845,13 +1840,10 @@ static int rtw_cfg80211_set_wpa_ie(struct adapter *padapter, u8 *pie, size_t iel
} }
if (group_cipher == 0) if (group_cipher == 0)
{
group_cipher = WPA_CIPHER_NONE; group_cipher = WPA_CIPHER_NONE;
}
if (pairwise_cipher == 0) if (pairwise_cipher == 0)
{
pairwise_cipher = WPA_CIPHER_NONE; pairwise_cipher = WPA_CIPHER_NONE;
}
switch (group_cipher) switch (group_cipher)
{ {
@ -1954,8 +1946,7 @@ static int cfg80211_rtw_join_ibss(struct wiphy *wiphy, struct net_device *ndev,
goto exit; goto exit;
} }
if (!params->ssid || !params->ssid_len) if (!params->ssid || !params->ssid_len) {
{
ret = -EINVAL; ret = -EINVAL;
goto exit; goto exit;
} }
@ -1981,8 +1972,7 @@ static int cfg80211_rtw_join_ibss(struct wiphy *wiphy, struct net_device *ndev,
ret = rtw_cfg80211_set_auth_type(psecuritypriv, NL80211_AUTHTYPE_OPEN_SYSTEM); ret = rtw_cfg80211_set_auth_type(psecuritypriv, NL80211_AUTHTYPE_OPEN_SYSTEM);
rtw_set_802_11_authentication_mode(padapter, psecuritypriv->ndisauthtype); rtw_set_802_11_authentication_mode(padapter, psecuritypriv->ndisauthtype);
if (rtw_set_802_11_ssid(padapter, &ndis_ssid) == false) if (rtw_set_802_11_ssid(padapter, &ndis_ssid) == false) {
{
ret = -1; ret = -1;
goto exit; goto exit;
} }
@ -2004,8 +1994,7 @@ static int cfg80211_rtw_leave_ibss(struct wiphy *wiphy, struct net_device *ndev)
rtw_set_to_roam(padapter, 0); rtw_set_to_roam(padapter, 0);
if (check_fwstate(&padapter->mlmepriv, _FW_LINKED)) if (check_fwstate(&padapter->mlmepriv, _FW_LINKED)) {
{
rtw_scan_abort(padapter); rtw_scan_abort(padapter);
LeaveAllPowerSaveMode(padapter); LeaveAllPowerSaveMode(padapter);
@ -2041,8 +2030,7 @@ static int cfg80211_rtw_connect(struct wiphy *wiphy, struct net_device *ndev,
sme->privacy, sme->key, sme->key_len, sme->key_idx); sme->privacy, sme->key, sme->key_len, sme->key_idx);
if (adapter_wdev_data(padapter)->block == true) if (adapter_wdev_data(padapter)->block == true) {
{
ret = -EBUSY; ret = -EBUSY;
DBG_871X("%s wdev_priv.block is set\n", __func__); DBG_871X("%s wdev_priv.block is set\n", __func__);
goto exit; goto exit;
@ -2059,8 +2047,7 @@ static int cfg80211_rtw_connect(struct wiphy *wiphy, struct net_device *ndev,
goto exit; goto exit;
} }
if (!sme->ssid || !sme->ssid_len) if (!sme->ssid || !sme->ssid_len) {
{
ret = -EINVAL; ret = -EINVAL;
goto exit; goto exit;
} }
@ -2119,10 +2106,8 @@ static int cfg80211_rtw_connect(struct wiphy *wiphy, struct net_device *ndev,
} }
/* For WEP Shared auth */ /* For WEP Shared auth */
if ((psecuritypriv->dot11AuthAlgrthm == dot11AuthAlgrthm_Shared if ((psecuritypriv->dot11AuthAlgrthm == dot11AuthAlgrthm_Shared ||
|| psecuritypriv->dot11AuthAlgrthm == dot11AuthAlgrthm_Auto) && sme->key psecuritypriv->dot11AuthAlgrthm == dot11AuthAlgrthm_Auto) && sme->key) {
)
{
u32 wep_key_idx, wep_key_len, wep_total_len; u32 wep_key_idx, wep_key_len, wep_total_len;
struct ndis_802_11_wep *pwep = NULL; struct ndis_802_11_wep *pwep = NULL;
DBG_871X("%s(): Shared/Auto WEP\n", __func__); DBG_871X("%s(): Shared/Auto WEP\n", __func__);
@ -2135,8 +2120,7 @@ static int cfg80211_rtw_connect(struct wiphy *wiphy, struct net_device *ndev,
goto exit; goto exit;
} }
if (wep_key_len > 0) if (wep_key_len > 0) {
{
wep_key_len = wep_key_len <= 5 ? 5 : 13; wep_key_len = wep_key_len <= 5 ? 5 : 13;
wep_total_len = wep_key_len + FIELD_OFFSET(struct ndis_802_11_wep, KeyMaterial); wep_total_len = wep_key_len + FIELD_OFFSET(struct ndis_802_11_wep, KeyMaterial);
pwep = rtw_malloc(wep_total_len); pwep = rtw_malloc(wep_total_len);
@ -2151,13 +2135,11 @@ static int cfg80211_rtw_connect(struct wiphy *wiphy, struct net_device *ndev,
pwep->KeyLength = wep_key_len; pwep->KeyLength = wep_key_len;
pwep->Length = wep_total_len; pwep->Length = wep_total_len;
if (wep_key_len == 13) if (wep_key_len == 13) {
{
padapter->securitypriv.dot11PrivacyAlgrthm = _WEP104_; padapter->securitypriv.dot11PrivacyAlgrthm = _WEP104_;
padapter->securitypriv.dot118021XGrpPrivacy = _WEP104_; padapter->securitypriv.dot118021XGrpPrivacy = _WEP104_;
} }
} } else {
else {
ret = -EINVAL; ret = -EINVAL;
goto exit; goto exit;
} }
@ -2168,9 +2150,7 @@ static int cfg80211_rtw_connect(struct wiphy *wiphy, struct net_device *ndev,
memcpy(pwep->KeyMaterial, (void *)sme->key, pwep->KeyLength); memcpy(pwep->KeyMaterial, (void *)sme->key, pwep->KeyLength);
if (rtw_set_802_11_add_wep(padapter, pwep) == (u8)_FAIL) if (rtw_set_802_11_add_wep(padapter, pwep) == (u8)_FAIL)
{
ret = -EOPNOTSUPP; ret = -EOPNOTSUPP;
}
kfree(pwep); kfree(pwep);
@ -2290,17 +2270,14 @@ static int cfg80211_rtw_set_pmksa(struct wiphy *wiphy,
DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev)); DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev));
if (!memcmp((u8 *)pmksa->bssid, strZeroMacAddress, ETH_ALEN)) if (!memcmp((u8 *)pmksa->bssid, strZeroMacAddress, ETH_ALEN))
{
return -EINVAL; return -EINVAL;
}
blInserted = false; blInserted = false;
/* overwrite PMKID */ /* overwrite PMKID */
for (index = 0 ; index < NUM_PMKID_CACHE; index++) for (index = 0 ; index < NUM_PMKID_CACHE; index++) {
{ if (!memcmp(psecuritypriv->PMKIDList[index].Bssid, (u8 *)pmksa->bssid, ETH_ALEN)) {
if (!memcmp(psecuritypriv->PMKIDList[index].Bssid, (u8 *)pmksa->bssid, ETH_ALEN)) /* BSSID is matched, the same AP => rewrite with new PMKID. */
{ /* BSSID is matched, the same AP => rewrite with new PMKID. */
DBG_871X(FUNC_NDEV_FMT" BSSID exists in the PMKList.\n", FUNC_NDEV_ARG(ndev)); DBG_871X(FUNC_NDEV_FMT" BSSID exists in the PMKList.\n", FUNC_NDEV_ARG(ndev));
memcpy(psecuritypriv->PMKIDList[index].PMKID, (u8 *)pmksa->pmkid, WLAN_PMKID_LEN); memcpy(psecuritypriv->PMKIDList[index].PMKID, (u8 *)pmksa->pmkid, WLAN_PMKID_LEN);
@ -2311,8 +2288,7 @@ static int cfg80211_rtw_set_pmksa(struct wiphy *wiphy,
} }
} }
if (!blInserted) if (!blInserted) {
{
/* Find a new entry */ /* Find a new entry */
DBG_871X(FUNC_NDEV_FMT" Use the new entry index = %d for this PMKID.\n", DBG_871X(FUNC_NDEV_FMT" Use the new entry index = %d for this PMKID.\n",
FUNC_NDEV_ARG(ndev), psecuritypriv->PMKIDIndex); FUNC_NDEV_ARG(ndev), psecuritypriv->PMKIDIndex);
@ -2323,9 +2299,7 @@ static int cfg80211_rtw_set_pmksa(struct wiphy *wiphy,
psecuritypriv->PMKIDList[psecuritypriv->PMKIDIndex].bUsed = true; psecuritypriv->PMKIDList[psecuritypriv->PMKIDIndex].bUsed = true;
psecuritypriv->PMKIDIndex++; psecuritypriv->PMKIDIndex++;
if (psecuritypriv->PMKIDIndex == 16) if (psecuritypriv->PMKIDIndex == 16)
{
psecuritypriv->PMKIDIndex = 0; psecuritypriv->PMKIDIndex = 0;
}
} }
return 0; return 0;
@ -2341,10 +2315,12 @@ static int cfg80211_rtw_del_pmksa(struct wiphy *wiphy,
DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev)); DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev));
for (index = 0 ; index < NUM_PMKID_CACHE; index++) for (index = 0 ; index < NUM_PMKID_CACHE; index++) {
{ if (!memcmp(psecuritypriv->PMKIDList[index].Bssid, (u8 *)pmksa->bssid, ETH_ALEN)) {
if (!memcmp(psecuritypriv->PMKIDList[index].Bssid, (u8 *)pmksa->bssid, ETH_ALEN)) /*
{ /* BSSID is matched, the same AP => Remove this PMKID information and reset it. */ * BSSID is matched, the same AP => Remove this PMKID information
* and reset it.
*/
eth_zero_addr(psecuritypriv->PMKIDList[index].Bssid); eth_zero_addr(psecuritypriv->PMKIDList[index].Bssid);
memset(psecuritypriv->PMKIDList[index].PMKID, 0x00, WLAN_PMKID_LEN); memset(psecuritypriv->PMKIDList[index].PMKID, 0x00, WLAN_PMKID_LEN);
psecuritypriv->PMKIDList[index].bUsed = false; psecuritypriv->PMKIDList[index].bUsed = false;
@ -2353,8 +2329,7 @@ static int cfg80211_rtw_del_pmksa(struct wiphy *wiphy,
} }
} }
if (false == bMatched) if (false == bMatched) {
{
DBG_871X(FUNC_NDEV_FMT" do not have matched BSSID\n" DBG_871X(FUNC_NDEV_FMT" do not have matched BSSID\n"
, FUNC_NDEV_ARG(ndev)); , FUNC_NDEV_ARG(ndev));
return -EINVAL; return -EINVAL;
@ -2441,8 +2416,7 @@ static netdev_tx_t rtw_cfg80211_monitor_if_xmit_entry(struct sk_buff *skb, struc
if (unlikely(skb->len < rtap_len)) if (unlikely(skb->len < rtap_len))
goto fail; goto fail;
if (rtap_len != 14) if (rtap_len != 14) {
{
DBG_8192C("radiotap len (should be 14): %d\n", rtap_len); DBG_8192C("radiotap len (should be 14): %d\n", rtap_len);
goto fail; goto fail;
} }
@ -2478,11 +2452,8 @@ static netdev_tx_t rtw_cfg80211_monitor_if_xmit_entry(struct sk_buff *skb, struc
/* Use the real net device to transmit the packet */ /* Use the real net device to transmit the packet */
return _rtw_xmit_entry(skb, padapter->pnetdev); return _rtw_xmit_entry(skb, padapter->pnetdev);
} } else if ((frame_control & (IEEE80211_FCTL_FTYPE|IEEE80211_FCTL_STYPE)) ==
else if ((frame_control & (IEEE80211_FCTL_FTYPE|IEEE80211_FCTL_STYPE)) (IEEE80211_FTYPE_MGMT|IEEE80211_STYPE_ACTION)) {
== (IEEE80211_FTYPE_MGMT|IEEE80211_STYPE_ACTION)
)
{
/* only for action frames */ /* only for action frames */
struct xmit_frame *pmgntframe; struct xmit_frame *pmgntframe;
struct pkt_attrib *pattrib; struct pkt_attrib *pattrib;
@ -2511,9 +2482,7 @@ static netdev_tx_t rtw_cfg80211_monitor_if_xmit_entry(struct sk_buff *skb, struc
/* starting alloc mgmt frame to dump it */ /* starting alloc mgmt frame to dump it */
if ((pmgntframe = alloc_mgtxmitframe(pxmitpriv)) == NULL) if ((pmgntframe = alloc_mgtxmitframe(pxmitpriv)) == NULL)
{
goto fail; goto fail;
}
/* update attribute */ /* update attribute */
pattrib = &pmgntframe->attrib; pattrib = &pmgntframe->attrib;
@ -2538,9 +2507,7 @@ static netdev_tx_t rtw_cfg80211_monitor_if_xmit_entry(struct sk_buff *skb, struc
dump_mgntframe(padapter, pmgntframe); dump_mgntframe(padapter, pmgntframe);
} } else {
else
{
DBG_8192C("frame_control = 0x%x\n", frame_control & (IEEE80211_FCTL_FTYPE|IEEE80211_FCTL_STYPE)); DBG_8192C("frame_control = 0x%x\n", frame_control & (IEEE80211_FCTL_FTYPE|IEEE80211_FCTL_STYPE));
} }
@ -2738,12 +2705,9 @@ static int rtw_add_beacon(struct adapter *adapter, const u8 *head, size_t head_l
rtw_ies_remove_ie(pbuf, &len, _BEACON_IE_OFFSET_, _VENDOR_SPECIFIC_IE_, P2P_OUI, 4); rtw_ies_remove_ie(pbuf, &len, _BEACON_IE_OFFSET_, _VENDOR_SPECIFIC_IE_, P2P_OUI, 4);
rtw_ies_remove_ie(pbuf, &len, _BEACON_IE_OFFSET_, _VENDOR_SPECIFIC_IE_, WFD_OUI, 4); rtw_ies_remove_ie(pbuf, &len, _BEACON_IE_OFFSET_, _VENDOR_SPECIFIC_IE_, WFD_OUI, 4);
if (rtw_check_beacon_data(adapter, pbuf, len) == _SUCCESS) if (rtw_check_beacon_data(adapter, pbuf, len) == _SUCCESS) {
{
ret = 0; ret = 0;
} } else {
else
{
ret = -EINVAL; ret = -EINVAL;
} }
@ -2819,15 +2783,13 @@ static int cfg80211_rtw_del_station(struct wiphy *wiphy, struct net_device *ndev
DBG_871X("+"FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev)); DBG_871X("+"FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev));
if (check_fwstate(pmlmepriv, (_FW_LINKED|WIFI_AP_STATE)) != true) if (check_fwstate(pmlmepriv, (_FW_LINKED|WIFI_AP_STATE)) != true) {
{
DBG_8192C("%s, fw_state != FW_LINKED|WIFI_AP_STATE\n", __func__); DBG_8192C("%s, fw_state != FW_LINKED|WIFI_AP_STATE\n", __func__);
return -EINVAL; return -EINVAL;
} }
if (!mac) if (!mac) {
{
DBG_8192C("flush all sta, and cam_entry\n"); DBG_8192C("flush all sta, and cam_entry\n");
flush_all_cam_entry(padapter); /* clear CAM */ flush_all_cam_entry(padapter); /* clear CAM */
@ -2842,8 +2804,7 @@ static int cfg80211_rtw_del_station(struct wiphy *wiphy, struct net_device *ndev
if (mac[0] == 0xff && mac[1] == 0xff && if (mac[0] == 0xff && mac[1] == 0xff &&
mac[2] == 0xff && mac[3] == 0xff && mac[2] == 0xff && mac[3] == 0xff &&
mac[4] == 0xff && mac[5] == 0xff) mac[4] == 0xff && mac[5] == 0xff) {
{
return -EINVAL; return -EINVAL;
} }
@ -2854,20 +2815,15 @@ static int cfg80211_rtw_del_station(struct wiphy *wiphy, struct net_device *ndev
plist = get_next(phead); plist = get_next(phead);
/* check asoc_queue */ /* check asoc_queue */
while (phead != plist) while (phead != plist) {
{
psta = LIST_CONTAINOR(plist, struct sta_info, asoc_list); psta = LIST_CONTAINOR(plist, struct sta_info, asoc_list);
plist = get_next(plist); plist = get_next(plist);
if (!memcmp((u8 *)mac, psta->hwaddr, ETH_ALEN)) if (!memcmp((u8 *)mac, psta->hwaddr, ETH_ALEN)) {
{ if (psta->dot8021xalg == 1 && psta->bpairwise_key_installed == false) {
if (psta->dot8021xalg == 1 && psta->bpairwise_key_installed == false)
{
DBG_8192C("%s, sta's dot8021xalg = 1 and key_installed = false\n", __func__); DBG_8192C("%s, sta's dot8021xalg = 1 and key_installed = false\n", __func__);
} } else {
else
{
DBG_8192C("free psta =%p, aid =%d\n", psta, psta->aid); DBG_8192C("free psta =%p, aid =%d\n", psta, psta->aid);
list_del_init(&psta->asoc_list); list_del_init(&psta->asoc_list);
@ -2913,8 +2869,7 @@ static struct sta_info *rtw_sta_info_get_by_idx(const int idx, struct sta_priv *
plist = get_next(phead); plist = get_next(phead);
/* check asoc_queue */ /* check asoc_queue */
while (phead != plist) while (phead != plist) {
{
if (idx == i) psta = LIST_CONTAINOR(plist, struct sta_info, asoc_list); if (idx == i) psta = LIST_CONTAINOR(plist, struct sta_info, asoc_list);
plist = get_next(plist); plist = get_next(plist);
i++; i++;
@ -2935,8 +2890,7 @@ static int cfg80211_rtw_dump_station(struct wiphy *wiphy, struct net_device *nde
spin_lock_bh(&pstapriv->asoc_list_lock); spin_lock_bh(&pstapriv->asoc_list_lock);
psta = rtw_sta_info_get_by_idx(idx, pstapriv); psta = rtw_sta_info_get_by_idx(idx, pstapriv);
spin_unlock_bh(&pstapriv->asoc_list_lock); spin_unlock_bh(&pstapriv->asoc_list_lock);
if (NULL == psta) if (NULL == psta) {
{
DBG_871X("Station is not found\n"); DBG_871X("Station is not found\n");
ret = -ENOENT; ret = -ENOENT;
goto exit; goto exit;
@ -2998,8 +2952,7 @@ static int _cfg80211_rtw_mgmt_tx(struct adapter *padapter, u8 tx_ch, const u8 *b
} }
/* starting alloc mgmt frame to dump it */ /* starting alloc mgmt frame to dump it */
if ((pmgntframe = alloc_mgtxmitframe(pxmitpriv)) == NULL) if ((pmgntframe = alloc_mgtxmitframe(pxmitpriv)) == NULL) {
{
/* ret = -ENOMEM; */ /* ret = -ENOMEM; */
ret = _FAIL; ret = _FAIL;
goto exit; goto exit;
@ -3025,18 +2978,14 @@ static int _cfg80211_rtw_mgmt_tx(struct adapter *padapter, u8 tx_ch, const u8 *b
pattrib->last_txcmdsz = pattrib->pktlen; pattrib->last_txcmdsz = pattrib->pktlen;
if (dump_mgntframe_and_wait_ack(padapter, pmgntframe) != _SUCCESS) if (dump_mgntframe_and_wait_ack(padapter, pmgntframe) != _SUCCESS) {
{
ack = false; ack = false;
ret = _FAIL; ret = _FAIL;
#ifdef DEBUG_CFG80211 #ifdef DEBUG_CFG80211
DBG_8192C("%s, ack == _FAIL\n", __func__); DBG_8192C("%s, ack == _FAIL\n", __func__);
#endif #endif
} } else {
else
{
msleep(50); msleep(50);
#ifdef DEBUG_CFG80211 #ifdef DEBUG_CFG80211
@ -3129,9 +3078,7 @@ static int cfg80211_rtw_mgmt_tx(struct wiphy *wiphy,
rtw_clear_scan_deny(padapter); rtw_clear_scan_deny(padapter);
break; break;
case P2P_INVIT_RESP: case P2P_INVIT_RESP:
if (pwdev_priv->invit_info.flags & BIT(0) if (pwdev_priv->invit_info.flags & BIT(0) && pwdev_priv->invit_info.status == 0) {
&& pwdev_priv->invit_info.status == 0)
{
DBG_871X(FUNC_ADPT_FMT" agree with invitation of persistent group\n", DBG_871X(FUNC_ADPT_FMT" agree with invitation of persistent group\n",
FUNC_ADPT_ARG(padapter)); FUNC_ADPT_ARG(padapter));
rtw_set_scan_deny(padapter, 5000); rtw_set_scan_deny(padapter, 5000);
@ -3148,10 +3095,9 @@ exit:
} }
#if defined(CONFIG_PNO_SUPPORT) #if defined(CONFIG_PNO_SUPPORT)
static int cfg80211_rtw_sched_scan_start(struct wiphy *wiphy, static int cfg80211_rtw_sched_scan_start(struct wiphy *wiphy, struct net_device *dev,
struct net_device *dev, struct cfg80211_sched_scan_request *request)
struct cfg80211_sched_scan_request *request) { {
struct adapter *padapter = rtw_netdev_priv(dev); struct adapter *padapter = rtw_netdev_priv(dev);
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
int ret; int ret;
@ -3190,8 +3136,8 @@ exit:
return ret; return ret;
} }
static int cfg80211_rtw_sched_scan_stop(struct wiphy *wiphy, static int cfg80211_rtw_sched_scan_stop(struct wiphy *wiphy, struct net_device *dev)
struct net_device *dev) { {
return rtw_android_pno_enable(dev, false); return rtw_android_pno_enable(dev, false);
} }
#endif /* CONFIG_PNO_SUPPORT */ #endif /* CONFIG_PNO_SUPPORT */
@ -3229,24 +3175,19 @@ static void rtw_cfg80211_init_ht_capab(struct ieee80211_sta_ht_cap *ht_cap, enum
*if BW_40 rx_mask[4]= 0x01; *if BW_40 rx_mask[4]= 0x01;
*highest supported RX rate *highest supported RX rate
*/ */
if (rf_type == RF_1T1R) if (rf_type == RF_1T1R) {
{
ht_cap->mcs.rx_mask[0] = 0xFF; ht_cap->mcs.rx_mask[0] = 0xFF;
ht_cap->mcs.rx_mask[1] = 0x00; ht_cap->mcs.rx_mask[1] = 0x00;
ht_cap->mcs.rx_mask[4] = 0x01; ht_cap->mcs.rx_mask[4] = 0x01;
ht_cap->mcs.rx_highest = cpu_to_le16(MAX_BIT_RATE_40MHZ_MCS7); ht_cap->mcs.rx_highest = cpu_to_le16(MAX_BIT_RATE_40MHZ_MCS7);
} } else if ((rf_type == RF_1T2R) || (rf_type == RF_2T2R)) {
else if ((rf_type == RF_1T2R) || (rf_type == RF_2T2R))
{
ht_cap->mcs.rx_mask[0] = 0xFF; ht_cap->mcs.rx_mask[0] = 0xFF;
ht_cap->mcs.rx_mask[1] = 0xFF; ht_cap->mcs.rx_mask[1] = 0xFF;
ht_cap->mcs.rx_mask[4] = 0x01; ht_cap->mcs.rx_mask[4] = 0x01;
ht_cap->mcs.rx_highest = cpu_to_le16(MAX_BIT_RATE_40MHZ_MCS15); ht_cap->mcs.rx_highest = cpu_to_le16(MAX_BIT_RATE_40MHZ_MCS15);
} } else {
else
{
DBG_8192C("%s, error rf_type =%d\n", __func__, rf_type); DBG_8192C("%s, error rf_type =%d\n", __func__, rf_type);
} }