These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / staging / rtl8712 / rtl871x_mp_ioctl.c

diff --git a/kernel/drivers/staging/rtl8712/rtl871x_mp_ioctl.c b/kernel/drivers/staging/rtl8712/rtl871x_mp_ioctl.c
index 0b54612..b98a596 100644 (file)
--- a/kernel/drivers/staging/rtl8712/rtl871x_mp_ioctl.c
+++ b/kernel/drivers/staging/rtl8712/rtl871x_mp_ioctl.c
@@ -56,8 +56,9 @@ uint oid_rt_wireless_mode_hdl(struct oid_par_priv *poid_par_priv)
                                         Adapter->registrypriv.wireless_mode;
                        *poid_par_priv->bytes_rw =
                                        poid_par_priv->information_buf_len;
-               } else
+               } else {
                        status = RNDIS_STATUS_INVALID_LENGTH;
+               }
        } else {
                status = RNDIS_STATUS_NOT_ACCEPTED;
        }
@@ -160,13 +161,13 @@ static int mp_start_test(struct _adapter *padapter)
        struct mp_priv *pmppriv = &padapter->mppriv;
        struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
        struct wlan_network *tgt_network = &pmlmepriv->cur_network;
-       struct ndis_wlan_bssid_ex bssid;
+       struct wlan_bssid_ex bssid;
        struct sta_info *psta;
        unsigned long length;
        unsigned long irqL;
        int res = _SUCCESS;
 
-       /* 3 1. initialize a new struct ndis_wlan_bssid_ex */
+       /* 3 1. initialize a new struct wlan_bssid_ex */
        memcpy(bssid.MacAddress, pmppriv->network_macaddr, ETH_ALEN);
        bssid.Ssid.SsidLength = 16;
        memcpy(bssid.Ssid.Ssid, (unsigned char *)"mp_pseudo_adhoc",
@@ -174,14 +175,15 @@ static int mp_start_test(struct _adapter *padapter)
        bssid.InfrastructureMode = Ndis802_11IBSS;
        bssid.NetworkTypeInUse = Ndis802_11DS;
        bssid.IELength = 0;
-       length = r8712_get_ndis_wlan_bssid_ex_sz(&bssid);
+       length = r8712_get_wlan_bssid_ex_sz(&bssid);
        if (length % 4) {
                /*round up to multiple of 4 bytes.*/
                bssid.Length = ((length >> 2) + 1) << 2;
-       } else
+       } else {
                bssid.Length = length;
+       }
        spin_lock_irqsave(&pmlmepriv->lock, irqL);
-       if (check_fwstate(pmlmepriv, WIFI_MP_STATE) == true)
+       if (check_fwstate(pmlmepriv, WIFI_MP_STATE))
                goto end_of_mp_start_test;
        /*init mp_start_test status*/
        pmppriv->prev_fw_state = get_fwstate(pmlmepriv);
@@ -223,7 +225,7 @@ static int mp_stop_test(struct _adapter *padapter)
        unsigned long irqL;
 
        spin_lock_irqsave(&pmlmepriv->lock, irqL);
-       if (check_fwstate(pmlmepriv, WIFI_MP_STATE) == false)
+       if (!check_fwstate(pmlmepriv, WIFI_MP_STATE))
                goto end_of_mp_stop_test;
        /* 3 1. disconnect psudo AdHoc */
        r8712_os_indicate_disconnect(padapter);
@@ -247,9 +249,9 @@ int mp_start_joinbss(struct _adapter *padapter, struct ndis_802_11_ssid *pssid)
        struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
        unsigned char res = _SUCCESS;
 
-       if (check_fwstate(pmlmepriv, WIFI_MP_STATE) == false)
+       if (!check_fwstate(pmlmepriv, WIFI_MP_STATE))
                return _FAIL;
-       if (check_fwstate(pmlmepriv, _FW_LINKED) == false)
+       if (!check_fwstate(pmlmepriv, _FW_LINKED))
                return _FAIL;
        _clr_fwstate_(pmlmepriv, _FW_LINKED);
        res = r8712_setassocsta_cmd(padapter, pmppriv->network_macaddr);
@@ -293,7 +295,7 @@ uint oid_rt_pro_start_test_hdl(struct oid_par_priv *poid_par_priv)
        r8712_write8(Adapter, MSR, 1); /* Link in ad hoc network, 0x1025004C */
        r8712_write8(Adapter, RCR, 0); /* RCR : disable all pkt, 0x10250048 */
        /* RCR disable Check BSSID, 0x1025004a */
-       r8712_write8(Adapter, RCR+2, 0x57);
+       r8712_write8(Adapter, RCR + 2, 0x57);
        /* disable RX filter map , mgt frames will put in RX FIFO 0 */
        r8712_write16(Adapter, RXFLTMAP0, 0x0);
        val8 = r8712_read8(Adapter, EE_9346CR);
@@ -388,8 +390,9 @@ uint oid_rt_pro_query_tx_packet_sent_hdl(
                *(u32 *)poid_par_priv->information_buf =
                                        Adapter->mppriv.tx_pktcount;
                *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
-       } else
+       } else {
                status = RNDIS_STATUS_INVALID_LENGTH;
+       }
        return status;
 }
 
@@ -408,8 +411,9 @@ uint oid_rt_pro_query_rx_packet_received_hdl(
                *(u32 *)poid_par_priv->information_buf =
                                        Adapter->mppriv.rx_pktcount;
                *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
-       } else
+       } else {
                status = RNDIS_STATUS_INVALID_LENGTH;
+       }
        return status;
 }
 
@@ -428,8 +432,9 @@ uint oid_rt_pro_query_rx_packet_crc32_error_hdl(
                *(u32 *)poid_par_priv->information_buf =
                                        Adapter->mppriv.rx_crcerrpktcount;
                *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
-       } else
+       } else {
                status = RNDIS_STATUS_INVALID_LENGTH;
+       }
        return status;
 }
 
@@ -457,8 +462,9 @@ uint oid_rt_pro_reset_rx_packet_received_hdl(struct oid_par_priv
        if (poid_par_priv->information_buf_len == sizeof(u32)) {
                Adapter->mppriv.rx_pktcount = 0;
                Adapter->mppriv.rx_crcerrpktcount = 0;
-       } else
+       } else {
                status = RNDIS_STATUS_INVALID_LENGTH;
+       }
        return status;
 }
 
@@ -684,7 +690,7 @@ uint oid_rt_get_thermal_meter_hdl(struct oid_par_priv *poid_par_priv)
        if (poid_par_priv->type_of_oid != QUERY_OID)
                return RNDIS_STATUS_NOT_ACCEPTED;
 
-       if (Adapter->mppriv.act_in_progress == true)
+       if (Adapter->mppriv.act_in_progress)
                return RNDIS_STATUS_NOT_ACCEPTED;
 
        if (poid_par_priv->information_buf_len < sizeof(u8))
@@ -728,7 +734,7 @@ uint oid_rt_pro_read_efuse_hdl(struct oid_par_priv *poid_par_priv)
        if ((addr > 511) || (cnts < 1) || (cnts > 512) || (addr + cnts) >
             EFUSE_MAX_SIZE)
                return RNDIS_STATUS_NOT_ACCEPTED;
-       if (r8712_efuse_access(Adapter, true, addr, cnts, data) == false)
+       if (!r8712_efuse_access(Adapter, true, addr, cnts, data))
                status = RNDIS_STATUS_FAILURE;
        *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
        return status;
@@ -756,7 +762,7 @@ uint oid_rt_pro_write_efuse_hdl(struct oid_par_priv *poid_par_priv)
        if ((addr > 511) || (cnts < 1) || (cnts > 512) ||
            (addr + cnts) > r8712_efuse_get_max_size(Adapter))
                return RNDIS_STATUS_NOT_ACCEPTED;
-       if (r8712_efuse_access(Adapter, false, addr, cnts, data) == false)
+       if (!r8712_efuse_access(Adapter, false, addr, cnts, data))
                status = RNDIS_STATUS_FAILURE;
        return status;
 }
@@ -824,7 +830,7 @@ uint oid_rt_pro_efuse_map_hdl(struct oid_par_priv *poid_par_priv)
                        status = RNDIS_STATUS_FAILURE;
        } else {
                /* SET_OID */
-               if (r8712_efuse_reg_init(Adapter) == true) {
+               if (r8712_efuse_reg_init(Adapter)) {
                        if (r8712_efuse_map_write(Adapter, 0,
                            EFUSE_MAP_MAX_SIZE, data))
                                *poid_par_priv->bytes_rw = EFUSE_MAP_MAX_SIZE;
@@ -879,7 +885,7 @@ uint oid_rt_set_rx_packet_type_hdl(struct oid_par_priv
                rcr_val32 |= (RCR_AB | RCR_AM | RCR_APM | RCR_AAP | RCR_ACRC32);
                break;
        case RX_PKT_PHY_MATCH:
-               rcr_val32 |= (RCR_APM|RCR_ACRC32);
+               rcr_val32 |= (RCR_APM | RCR_ACRC32);
                break;
        default:
                rcr_val32 &= ~(RCR_AAP |