diff options
Diffstat (limited to 'drivers/staging/rtl8712/rtl871x_mp_ioctl.c')
| -rw-r--r-- | drivers/staging/rtl8712/rtl871x_mp_ioctl.c | 27 |
1 files changed, 3 insertions, 24 deletions
diff --git a/drivers/staging/rtl8712/rtl871x_mp_ioctl.c b/drivers/staging/rtl8712/rtl871x_mp_ioctl.c index 588346da1412..aa8f8500cbb2 100644 --- a/drivers/staging/rtl8712/rtl871x_mp_ioctl.c +++ b/drivers/staging/rtl8712/rtl871x_mp_ioctl.c @@ -153,7 +153,7 @@ static int mp_start_test(struct _adapter *padapter) struct sta_info *psta; unsigned long length; unsigned long irqL; - int res = _SUCCESS; + int res = 0; /* 3 1. initialize a new struct wlan_bssid_ex */ memcpy(bssid.MacAddress, pmppriv->network_macaddr, ETH_ALEN); @@ -187,7 +187,7 @@ static int mp_start_test(struct _adapter *padapter) r8712_free_stainfo(padapter, psta); psta = r8712_alloc_stainfo(&padapter->stapriv, bssid.MacAddress); if (psta == NULL) { - res = _FAIL; + res = -ENOMEM; goto end_of_mp_start_test; } /* 3 3. join pseudo AdHoc */ @@ -231,22 +231,6 @@ end_of_mp_stop_test: return _SUCCESS; } -int mp_start_joinbss(struct _adapter *padapter, struct ndis_802_11_ssid *pssid) -{ - struct mp_priv *pmppriv = &padapter->mppriv; - struct mlme_priv *pmlmepriv = &padapter->mlmepriv; - unsigned char res = _SUCCESS; - - if (!check_fwstate(pmlmepriv, WIFI_MP_STATE)) - return _FAIL; - if (!check_fwstate(pmlmepriv, _FW_LINKED)) - return _FAIL; - _clr_fwstate_(pmlmepriv, _FW_LINKED); - res = r8712_setassocsta_cmd(padapter, pmppriv->network_macaddr); - set_fwstate(pmlmepriv, _FW_UNDER_LINKING); - return res; -} - uint oid_rt_pro_set_data_rate_hdl(struct oid_par_priv *poid_par_priv) { @@ -278,7 +262,7 @@ uint oid_rt_pro_start_test_hdl(struct oid_par_priv *poid_par_priv) return RNDIS_STATUS_NOT_ACCEPTED; mode = *((u32 *)poid_par_priv->information_buf); Adapter->mppriv.mode = mode;/* 1 for loopback*/ - if (mp_start_test(Adapter) == _FAIL) + if (mp_start_test(Adapter)) status = RNDIS_STATUS_NOT_ACCEPTED; r8712_write8(Adapter, MSR, 1); /* Link in ad hoc network, 0x1025004C */ r8712_write8(Adapter, RCR, 0); /* RCR : disable all pkt, 0x10250048 */ @@ -661,11 +645,6 @@ uint oid_rt_pro_write_register_hdl(struct oid_par_priv *poid_par_priv) status = RNDIS_STATUS_NOT_ACCEPTED; break; } - - if ((status == RNDIS_STATUS_SUCCESS) && - (RegRWStruct->offset == HIMR) && - (RegRWStruct->width == 4)) - Adapter->ImrContent = RegRWStruct->value; } return status; } |