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

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

diff --git a/kernel/drivers/staging/rtl8712/rtl871x_ioctl_rtl.c b/kernel/drivers/staging/rtl8712/rtl871x_ioctl_rtl.c
index ac0baff..7c346a4 100644 (file)
--- a/kernel/drivers/staging/rtl8712/rtl871x_ioctl_rtl.c
+++ b/kernel/drivers/staging/rtl8712/rtl871x_ioctl_rtl.c
@@ -58,8 +58,9 @@ uint oid_rt_get_small_packet_crc_hdl(struct oid_par_priv *poid_par_priv)
                *(u32 *)poid_par_priv->information_buf =
                                padapter->recvpriv.rx_smallpacket_crcerr;
                *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
-       } else
+       } else {
                return RNDIS_STATUS_INVALID_LENGTH;
+       }
        return RNDIS_STATUS_SUCCESS;
 }
 
@@ -74,8 +75,9 @@ uint oid_rt_get_middle_packet_crc_hdl(struct oid_par_priv *poid_par_priv)
                *(u32 *)poid_par_priv->information_buf =
                                padapter->recvpriv.rx_middlepacket_crcerr;
                *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
-       } else
+       } else {
                return RNDIS_STATUS_INVALID_LENGTH;
+       }
        return RNDIS_STATUS_SUCCESS;
 }
 
@@ -90,8 +92,9 @@ uint oid_rt_get_large_packet_crc_hdl(struct oid_par_priv *poid_par_priv)
                *(u32 *)poid_par_priv->information_buf =
                                 padapter->recvpriv.rx_largepacket_crcerr;
                *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
-       } else
+       } else {
                return RNDIS_STATUS_INVALID_LENGTH;
+       }
        return RNDIS_STATUS_SUCCESS;
 }
 
@@ -122,8 +125,9 @@ uint oid_rt_get_rx_total_packet_hdl(struct oid_par_priv *poid_par_priv)
                                         padapter->recvpriv.rx_pkts +
                                         padapter->recvpriv.rx_drop;
                *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
-       } else
+       } else {
                return RNDIS_STATUS_INVALID_LENGTH;
+       }
        return RNDIS_STATUS_SUCCESS;
 }
 
@@ -152,8 +156,9 @@ uint oid_rt_get_rx_icv_err_hdl(struct oid_par_priv *poid_par_priv)
                *(uint *)poid_par_priv->information_buf =
                                         padapter->recvpriv.rx_icv_err;
                *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
-       } else
+       } else {
                return RNDIS_STATUS_INVALID_LENGTH;
+       }
        return RNDIS_STATUS_SUCCESS;
 }
 
@@ -182,8 +187,9 @@ uint oid_rt_get_preamble_mode_hdl(struct oid_par_priv *poid_par_priv)
                        preamblemode = 2;
                *(u32 *)poid_par_priv->information_buf = preamblemode;
                *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
-       } else
+       } else {
                return RNDIS_STATUS_INVALID_LENGTH;
+       }
        return RNDIS_STATUS_SUCCESS;
 }
 
@@ -239,8 +245,9 @@ uint oid_rt_set_preamble_mode_hdl(struct oid_par_priv
                        padapter->registrypriv.preamble = PREAMBLE_SHORT;
                *(u32 *)poid_par_priv->information_buf = preamblemode;
                *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
-       } else
+       } else {
                return RNDIS_STATUS_INVALID_LENGTH;
+       }
        return RNDIS_STATUS_SUCCESS;
 }
 
@@ -269,8 +276,9 @@ uint oid_rt_get_total_tx_bytes_hdl(struct oid_par_priv
                *(u32 *)poid_par_priv->information_buf =
                                                 padapter->xmitpriv.tx_bytes;
                *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
-       } else
+       } else {
                return RNDIS_STATUS_INVALID_LENGTH;
+       }
        return RNDIS_STATUS_SUCCESS;
 }
 
@@ -287,8 +295,9 @@ uint oid_rt_get_total_rx_bytes_hdl(struct oid_par_priv
                                           padapter->recvpriv.rx_bytes;
                *poid_par_priv->bytes_rw = poid_par_priv->
                                           information_buf_len;
-       } else
+       } else {
                return RNDIS_STATUS_INVALID_LENGTH;
+       }
        return RNDIS_STATUS_SUCCESS;
 }
 
@@ -324,8 +333,8 @@ uint oid_rt_get_channel_hdl(struct oid_par_priv *poid_par_priv)
 
        if (poid_par_priv->type_of_oid != QUERY_OID)
                return RNDIS_STATUS_NOT_ACCEPTED;
-       if ((check_fwstate(pmlmepriv, _FW_LINKED) == true) ||
-           (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) == true))
+       if (check_fwstate(pmlmepriv, _FW_LINKED) ||
+           check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE))
                pnic_Config = &pmlmepriv->cur_network.network.Configuration;
        else
                pnic_Config = &padapter->registrypriv.dev_network.
@@ -364,8 +373,9 @@ uint oid_rt_supported_wireless_mode_hdl(struct oid_par_priv
                ulInfo |= 0x0400; /* WIRELESS_MODE_A */
                *(u32 *) poid_par_priv->information_buf = ulInfo;
                *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
-       } else
+       } else {
                return RNDIS_STATUS_INVALID_LENGTH;
+       }
        return RNDIS_STATUS_SUCCESS;
 }
 
@@ -451,8 +461,9 @@ uint oid_rt_pro_rf_write_registry_hdl(struct oid_par_priv*
                        (unsigned long)(*((unsigned long *)
                                        poid_par_priv->information_buf + 2))))
                        status = RNDIS_STATUS_NOT_ACCEPTED;
-       } else
+       } else {
                status = RNDIS_STATUS_INVALID_LENGTH;
+       }
        return status;
 }
 
@@ -464,10 +475,11 @@ uint oid_rt_pro_rf_read_registry_hdl(struct oid_par_priv *poid_par_priv)
 
        if (poid_par_priv->type_of_oid != SET_OID) /* QUERY_OID */
                return RNDIS_STATUS_NOT_ACCEPTED;
-       if (poid_par_priv->information_buf_len == (sizeof(unsigned long)*3)) {
-               if (Adapter->mppriv.act_in_progress == true)
+       if (poid_par_priv->information_buf_len == (sizeof(unsigned long) *
+                                                  3)) {
+               if (Adapter->mppriv.act_in_progress) {
                        status = RNDIS_STATUS_NOT_ACCEPTED;
-               else {
+               } else {
                        /* init workparam */
                        Adapter->mppriv.act_in_progress = true;
                        Adapter->mppriv.workparam.bcompleted = false;
@@ -489,8 +501,9 @@ uint oid_rt_pro_rf_read_registry_hdl(struct oid_par_priv *poid_par_priv)
                            io_value))
                                status = RNDIS_STATUS_NOT_ACCEPTED;
                }
-       } else
+       } else {
                status = RNDIS_STATUS_INVALID_LENGTH;
+       }
        return status;
 }
 
@@ -515,11 +528,11 @@ uint oid_rt_get_connect_state_hdl(struct oid_par_priv *poid_par_priv)
         * nStatus==2   AdHocMode
         * nStatus==3   NotAssociated
         */
-       if (check_fwstate(pmlmepriv, _FW_UNDER_LINKING) == true)
+       if (check_fwstate(pmlmepriv, _FW_UNDER_LINKING))
                ulInfo = CHECKINGSTATUS;
-       else if (check_fwstate(pmlmepriv, _FW_LINKED) == true)
+       else if (check_fwstate(pmlmepriv, _FW_LINKED))
                ulInfo = ASSOCIATED;
-       else if (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) == true)
+       else if (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE))
                ulInfo = ADHOCMODE;
        else
                ulInfo = NOTASSOCIATED;