* [PATCH 0/4] staging: rtl8712: Cleanups for rtl871x_ioctl_rtl
@ 2015-11-24 12:19 Mauro Dreissig
2015-11-24 12:19 ` [PATCH 1/4] staging: rtl8712: Remove casts between void * and type * Mauro Dreissig
` (3 more replies)
0 siblings, 4 replies; 11+ messages in thread
From: Mauro Dreissig @ 2015-11-24 12:19 UTC (permalink / raw)
To: Larry.Finger, florian.c.schilhabel, gregkh, devel, netdev; +Cc: Mauro Dreissig
This applies some janitorial work.
Mauro Dreissig (4):
staging: rtl8712: Remove casts between void * and type *
staging: rtl8712: Rename local variable
staging: rtl8712: Make error handling check for failure
staging: rtl8712: Rename local variable
drivers/staging/rtl8712/rtl871x_ioctl_rtl.c | 479 +++++++++++++---------------
drivers/staging/rtl8712/rtl871x_ioctl_rtl.h | 123 +++----
2 files changed, 266 insertions(+), 336 deletions(-)
--
2.6.3
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 1/4] staging: rtl8712: Remove casts between void * and type *
2015-11-24 12:19 [PATCH 0/4] staging: rtl8712: Cleanups for rtl871x_ioctl_rtl Mauro Dreissig
@ 2015-11-24 12:19 ` Mauro Dreissig
2015-11-24 13:07 ` Dan Carpenter
2015-11-24 12:19 ` [PATCH 2/4] staging: rtl8712: Rename local variable Mauro Dreissig
` (2 subsequent siblings)
3 siblings, 1 reply; 11+ messages in thread
From: Mauro Dreissig @ 2015-11-24 12:19 UTC (permalink / raw)
To: Larry.Finger, florian.c.schilhabel, gregkh, devel, netdev; +Cc: Mauro Dreissig
Cleaning rtl871x_ioctl_rtl.c.
Signed-off-by: Mauro Dreissig <mukadr@gmail.com>
---
drivers/staging/rtl8712/rtl871x_ioctl_rtl.c | 45 ++++++++++-------------------
1 file changed, 15 insertions(+), 30 deletions(-)
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_rtl.c b/drivers/staging/rtl8712/rtl871x_ioctl_rtl.c
index 7c346a4..c7f2e51 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_rtl.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_rtl.c
@@ -49,8 +49,7 @@ uint oid_rt_get_signal_quality_hdl(struct oid_par_priv *poid_par_priv)
uint oid_rt_get_small_packet_crc_hdl(struct oid_par_priv *poid_par_priv)
{
- struct _adapter *padapter = (struct _adapter *)
- (poid_par_priv->adapter_context);
+ struct _adapter *padapter = poid_par_priv->adapter_context;
if (poid_par_priv->type_of_oid != QUERY_OID)
return RNDIS_STATUS_NOT_ACCEPTED;
@@ -66,8 +65,7 @@ uint oid_rt_get_small_packet_crc_hdl(struct oid_par_priv *poid_par_priv)
uint oid_rt_get_middle_packet_crc_hdl(struct oid_par_priv *poid_par_priv)
{
- struct _adapter *padapter = (struct _adapter *)
- (poid_par_priv->adapter_context);
+ struct _adapter *padapter = poid_par_priv->adapter_context;
if (poid_par_priv->type_of_oid != QUERY_OID)
return RNDIS_STATUS_NOT_ACCEPTED;
@@ -83,8 +81,7 @@ uint oid_rt_get_middle_packet_crc_hdl(struct oid_par_priv *poid_par_priv)
uint oid_rt_get_large_packet_crc_hdl(struct oid_par_priv *poid_par_priv)
{
- struct _adapter *padapter = (struct _adapter *)
- (poid_par_priv->adapter_context);
+ struct _adapter *padapter = poid_par_priv->adapter_context;
if (poid_par_priv->type_of_oid != QUERY_OID)
return RNDIS_STATUS_NOT_ACCEPTED;
@@ -115,8 +112,7 @@ uint oid_rt_get_rx_retry_hdl(struct oid_par_priv *poid_par_priv)
uint oid_rt_get_rx_total_packet_hdl(struct oid_par_priv *poid_par_priv)
{
- struct _adapter *padapter = (struct _adapter *)
- (poid_par_priv->adapter_context);
+ struct _adapter *padapter = poid_par_priv->adapter_context;
if (poid_par_priv->type_of_oid != QUERY_OID)
return RNDIS_STATUS_NOT_ACCEPTED;
@@ -147,8 +143,7 @@ uint oid_rt_get_tx_beacon_err_hdl(struct oid_par_priv *poid_par_priv)
uint oid_rt_get_rx_icv_err_hdl(struct oid_par_priv *poid_par_priv)
{
- struct _adapter *padapter = (struct _adapter *)
- (poid_par_priv->adapter_context);
+ struct _adapter *padapter = poid_par_priv->adapter_context;
if (poid_par_priv->type_of_oid != QUERY_OID)
return RNDIS_STATUS_NOT_ACCEPTED;
@@ -172,8 +167,7 @@ uint oid_rt_set_encryption_algorithm_hdl(struct oid_par_priv
uint oid_rt_get_preamble_mode_hdl(struct oid_par_priv *poid_par_priv)
{
- struct _adapter *padapter = (struct _adapter *)
- (poid_par_priv->adapter_context);
+ struct _adapter *padapter = poid_par_priv->adapter_context;
u32 preamblemode = 0;
if (poid_par_priv->type_of_oid != QUERY_OID)
@@ -202,8 +196,7 @@ uint oid_rt_get_ap_ip_hdl(struct oid_par_priv *poid_par_priv)
uint oid_rt_get_channelplan_hdl(struct oid_par_priv *poid_par_priv)
{
- struct _adapter *padapter = (struct _adapter *)
- (poid_par_priv->adapter_context);
+ struct _adapter *padapter = poid_par_priv->adapter_context;
struct eeprom_priv *peeprompriv = &padapter->eeprompriv;
if (poid_par_priv->type_of_oid != QUERY_OID)
@@ -216,8 +209,7 @@ uint oid_rt_get_channelplan_hdl(struct oid_par_priv *poid_par_priv)
uint oid_rt_set_channelplan_hdl(struct oid_par_priv
*poid_par_priv)
{
- struct _adapter *padapter = (struct _adapter *)
- (poid_par_priv->adapter_context);
+ struct _adapter *padapter = poid_par_priv->adapter_context;
struct eeprom_priv *peeprompriv = &padapter->eeprompriv;
if (poid_par_priv->type_of_oid != SET_OID)
@@ -229,8 +221,7 @@ uint oid_rt_set_channelplan_hdl(struct oid_par_priv
uint oid_rt_set_preamble_mode_hdl(struct oid_par_priv
*poid_par_priv)
{
- struct _adapter *padapter = (struct _adapter *)
- (poid_par_priv->adapter_context);
+ struct _adapter *padapter = poid_par_priv->adapter_context;
u32 preamblemode = 0;
if (poid_par_priv->type_of_oid != SET_OID)
@@ -267,8 +258,7 @@ uint oid_rt_dedicate_probe_hdl(struct oid_par_priv
uint oid_rt_get_total_tx_bytes_hdl(struct oid_par_priv
*poid_par_priv)
{
- struct _adapter *padapter = (struct _adapter *)
- (poid_par_priv->adapter_context);
+ struct _adapter *padapter = poid_par_priv->adapter_context;
if (poid_par_priv->type_of_oid != QUERY_OID)
return RNDIS_STATUS_NOT_ACCEPTED;
@@ -285,8 +275,7 @@ uint oid_rt_get_total_tx_bytes_hdl(struct oid_par_priv
uint oid_rt_get_total_rx_bytes_hdl(struct oid_par_priv
*poid_par_priv)
{
- struct _adapter *padapter = (struct _adapter *)
- (poid_par_priv->adapter_context);
+ struct _adapter *padapter = poid_par_priv->adapter_context;
if (poid_par_priv->type_of_oid != QUERY_OID)
return RNDIS_STATUS_NOT_ACCEPTED;
@@ -325,8 +314,7 @@ uint oid_rt_get_enc_key_match_count_hdl(struct oid_par_priv
uint oid_rt_get_channel_hdl(struct oid_par_priv *poid_par_priv)
{
- struct _adapter *padapter = (struct _adapter *)
- (poid_par_priv->adapter_context);
+ struct _adapter *padapter = poid_par_priv->adapter_context;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct NDIS_802_11_CONFIGURATION *pnic_Config;
u32 channelnum;
@@ -449,8 +437,7 @@ uint oid_rt_pro_rf_write_registry_hdl(struct oid_par_priv*
poid_par_priv)
{
uint status = RNDIS_STATUS_SUCCESS;
- struct _adapter *Adapter = (struct _adapter *)
- (poid_par_priv->adapter_context);
+ struct _adapter *Adapter = poid_par_priv->adapter_context;
if (poid_par_priv->type_of_oid != SET_OID) /* QUERY_OID */
return RNDIS_STATUS_NOT_ACCEPTED;
@@ -470,8 +457,7 @@ uint oid_rt_pro_rf_write_registry_hdl(struct oid_par_priv*
uint oid_rt_pro_rf_read_registry_hdl(struct oid_par_priv *poid_par_priv)
{
uint status = RNDIS_STATUS_SUCCESS;
- struct _adapter *Adapter = (struct _adapter *)
- (poid_par_priv->adapter_context);
+ struct _adapter *Adapter = poid_par_priv->adapter_context;
if (poid_par_priv->type_of_oid != SET_OID) /* QUERY_OID */
return RNDIS_STATUS_NOT_ACCEPTED;
@@ -516,8 +502,7 @@ enum _CONNECT_STATE_ {
uint oid_rt_get_connect_state_hdl(struct oid_par_priv *poid_par_priv)
{
- struct _adapter *padapter = (struct _adapter *)
- (poid_par_priv->adapter_context);
+ struct _adapter *padapter = poid_par_priv->adapter_context;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
u32 ulInfo;
--
2.6.3
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 2/4] staging: rtl8712: Rename local variable
2015-11-24 12:19 [PATCH 0/4] staging: rtl8712: Cleanups for rtl871x_ioctl_rtl Mauro Dreissig
2015-11-24 12:19 ` [PATCH 1/4] staging: rtl8712: Remove casts between void * and type * Mauro Dreissig
@ 2015-11-24 12:19 ` Mauro Dreissig
2015-11-24 12:19 ` [PATCH 3/4] staging: rtl8712: Make error handling check for failure Mauro Dreissig
2015-11-24 12:19 ` [PATCH 4/4] staging: rtl8712: Rename local variable Mauro Dreissig
3 siblings, 0 replies; 11+ messages in thread
From: Mauro Dreissig @ 2015-11-24 12:19 UTC (permalink / raw)
To: Larry.Finger, florian.c.schilhabel, gregkh, devel, netdev; +Cc: Mauro Dreissig
Make all instances of struct _adapter be called adapter in
rtl871x_ioctl_rtl.c.
Signed-off-by: Mauro Dreissig <mukadr@gmail.com>
---
drivers/staging/rtl8712/rtl871x_ioctl_rtl.c | 86 ++++++++++++++---------------
1 file changed, 43 insertions(+), 43 deletions(-)
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_rtl.c b/drivers/staging/rtl8712/rtl871x_ioctl_rtl.c
index c7f2e51..97596aa 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_rtl.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_rtl.c
@@ -49,13 +49,13 @@ uint oid_rt_get_signal_quality_hdl(struct oid_par_priv *poid_par_priv)
uint oid_rt_get_small_packet_crc_hdl(struct oid_par_priv *poid_par_priv)
{
- struct _adapter *padapter = poid_par_priv->adapter_context;
+ struct _adapter *adapter = poid_par_priv->adapter_context;
if (poid_par_priv->type_of_oid != QUERY_OID)
return RNDIS_STATUS_NOT_ACCEPTED;
if (poid_par_priv->information_buf_len >= sizeof(u32)) {
*(u32 *)poid_par_priv->information_buf =
- padapter->recvpriv.rx_smallpacket_crcerr;
+ adapter->recvpriv.rx_smallpacket_crcerr;
*poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
} else {
return RNDIS_STATUS_INVALID_LENGTH;
@@ -65,13 +65,13 @@ uint oid_rt_get_small_packet_crc_hdl(struct oid_par_priv *poid_par_priv)
uint oid_rt_get_middle_packet_crc_hdl(struct oid_par_priv *poid_par_priv)
{
- struct _adapter *padapter = poid_par_priv->adapter_context;
+ struct _adapter *adapter = poid_par_priv->adapter_context;
if (poid_par_priv->type_of_oid != QUERY_OID)
return RNDIS_STATUS_NOT_ACCEPTED;
if (poid_par_priv->information_buf_len >= sizeof(u32)) {
*(u32 *)poid_par_priv->information_buf =
- padapter->recvpriv.rx_middlepacket_crcerr;
+ adapter->recvpriv.rx_middlepacket_crcerr;
*poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
} else {
return RNDIS_STATUS_INVALID_LENGTH;
@@ -81,13 +81,13 @@ uint oid_rt_get_middle_packet_crc_hdl(struct oid_par_priv *poid_par_priv)
uint oid_rt_get_large_packet_crc_hdl(struct oid_par_priv *poid_par_priv)
{
- struct _adapter *padapter = poid_par_priv->adapter_context;
+ struct _adapter *adapter = poid_par_priv->adapter_context;
if (poid_par_priv->type_of_oid != QUERY_OID)
return RNDIS_STATUS_NOT_ACCEPTED;
if (poid_par_priv->information_buf_len >= sizeof(u32)) {
*(u32 *)poid_par_priv->information_buf =
- padapter->recvpriv.rx_largepacket_crcerr;
+ adapter->recvpriv.rx_largepacket_crcerr;
*poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
} else {
return RNDIS_STATUS_INVALID_LENGTH;
@@ -112,14 +112,14 @@ uint oid_rt_get_rx_retry_hdl(struct oid_par_priv *poid_par_priv)
uint oid_rt_get_rx_total_packet_hdl(struct oid_par_priv *poid_par_priv)
{
- struct _adapter *padapter = poid_par_priv->adapter_context;
+ struct _adapter *adapter = poid_par_priv->adapter_context;
if (poid_par_priv->type_of_oid != QUERY_OID)
return RNDIS_STATUS_NOT_ACCEPTED;
if (poid_par_priv->information_buf_len >= sizeof(u32)) {
*(u32 *)poid_par_priv->information_buf =
- padapter->recvpriv.rx_pkts +
- padapter->recvpriv.rx_drop;
+ adapter->recvpriv.rx_pkts +
+ adapter->recvpriv.rx_drop;
*poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
} else {
return RNDIS_STATUS_INVALID_LENGTH;
@@ -143,13 +143,13 @@ uint oid_rt_get_tx_beacon_err_hdl(struct oid_par_priv *poid_par_priv)
uint oid_rt_get_rx_icv_err_hdl(struct oid_par_priv *poid_par_priv)
{
- struct _adapter *padapter = poid_par_priv->adapter_context;
+ struct _adapter *adapter = poid_par_priv->adapter_context;
if (poid_par_priv->type_of_oid != QUERY_OID)
return RNDIS_STATUS_NOT_ACCEPTED;
if (poid_par_priv->information_buf_len >= sizeof(u32)) {
*(uint *)poid_par_priv->information_buf =
- padapter->recvpriv.rx_icv_err;
+ adapter->recvpriv.rx_icv_err;
*poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
} else {
return RNDIS_STATUS_INVALID_LENGTH;
@@ -167,17 +167,17 @@ uint oid_rt_set_encryption_algorithm_hdl(struct oid_par_priv
uint oid_rt_get_preamble_mode_hdl(struct oid_par_priv *poid_par_priv)
{
- struct _adapter *padapter = poid_par_priv->adapter_context;
+ struct _adapter *adapter = poid_par_priv->adapter_context;
u32 preamblemode = 0;
if (poid_par_priv->type_of_oid != QUERY_OID)
return RNDIS_STATUS_NOT_ACCEPTED;
if (poid_par_priv->information_buf_len >= sizeof(u32)) {
- if (padapter->registrypriv.preamble == PREAMBLE_LONG)
+ if (adapter->registrypriv.preamble == PREAMBLE_LONG)
preamblemode = 0;
- else if (padapter->registrypriv.preamble == PREAMBLE_AUTO)
+ else if (adapter->registrypriv.preamble == PREAMBLE_AUTO)
preamblemode = 1;
- else if (padapter->registrypriv.preamble == PREAMBLE_SHORT)
+ else if (adapter->registrypriv.preamble == PREAMBLE_SHORT)
preamblemode = 2;
*(u32 *)poid_par_priv->information_buf = preamblemode;
*poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
@@ -196,8 +196,8 @@ uint oid_rt_get_ap_ip_hdl(struct oid_par_priv *poid_par_priv)
uint oid_rt_get_channelplan_hdl(struct oid_par_priv *poid_par_priv)
{
- struct _adapter *padapter = poid_par_priv->adapter_context;
- struct eeprom_priv *peeprompriv = &padapter->eeprompriv;
+ struct _adapter *adapter = poid_par_priv->adapter_context;
+ struct eeprom_priv *peeprompriv = &adapter->eeprompriv;
if (poid_par_priv->type_of_oid != QUERY_OID)
return RNDIS_STATUS_NOT_ACCEPTED;
@@ -209,8 +209,8 @@ uint oid_rt_get_channelplan_hdl(struct oid_par_priv *poid_par_priv)
uint oid_rt_set_channelplan_hdl(struct oid_par_priv
*poid_par_priv)
{
- struct _adapter *padapter = poid_par_priv->adapter_context;
- struct eeprom_priv *peeprompriv = &padapter->eeprompriv;
+ struct _adapter *adapter = poid_par_priv->adapter_context;
+ struct eeprom_priv *peeprompriv = &adapter->eeprompriv;
if (poid_par_priv->type_of_oid != SET_OID)
return RNDIS_STATUS_NOT_ACCEPTED;
@@ -221,7 +221,7 @@ uint oid_rt_set_channelplan_hdl(struct oid_par_priv
uint oid_rt_set_preamble_mode_hdl(struct oid_par_priv
*poid_par_priv)
{
- struct _adapter *padapter = poid_par_priv->adapter_context;
+ struct _adapter *adapter = poid_par_priv->adapter_context;
u32 preamblemode = 0;
if (poid_par_priv->type_of_oid != SET_OID)
@@ -229,11 +229,11 @@ uint oid_rt_set_preamble_mode_hdl(struct oid_par_priv
if (poid_par_priv->information_buf_len >= sizeof(u32)) {
preamblemode = *(u32 *)poid_par_priv->information_buf;
if (preamblemode == 0)
- padapter->registrypriv.preamble = PREAMBLE_LONG;
+ adapter->registrypriv.preamble = PREAMBLE_LONG;
else if (preamblemode == 1)
- padapter->registrypriv.preamble = PREAMBLE_AUTO;
+ adapter->registrypriv.preamble = PREAMBLE_AUTO;
else if (preamblemode == 2)
- padapter->registrypriv.preamble = PREAMBLE_SHORT;
+ adapter->registrypriv.preamble = PREAMBLE_SHORT;
*(u32 *)poid_par_priv->information_buf = preamblemode;
*poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
} else {
@@ -258,13 +258,13 @@ uint oid_rt_dedicate_probe_hdl(struct oid_par_priv
uint oid_rt_get_total_tx_bytes_hdl(struct oid_par_priv
*poid_par_priv)
{
- struct _adapter *padapter = poid_par_priv->adapter_context;
+ struct _adapter *adapter = poid_par_priv->adapter_context;
if (poid_par_priv->type_of_oid != QUERY_OID)
return RNDIS_STATUS_NOT_ACCEPTED;
if (poid_par_priv->information_buf_len >= sizeof(u32)) {
*(u32 *)poid_par_priv->information_buf =
- padapter->xmitpriv.tx_bytes;
+ adapter->xmitpriv.tx_bytes;
*poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
} else {
return RNDIS_STATUS_INVALID_LENGTH;
@@ -275,13 +275,13 @@ uint oid_rt_get_total_tx_bytes_hdl(struct oid_par_priv
uint oid_rt_get_total_rx_bytes_hdl(struct oid_par_priv
*poid_par_priv)
{
- struct _adapter *padapter = poid_par_priv->adapter_context;
+ struct _adapter *adapter = poid_par_priv->adapter_context;
if (poid_par_priv->type_of_oid != QUERY_OID)
return RNDIS_STATUS_NOT_ACCEPTED;
if (poid_par_priv->information_buf_len >= sizeof(u32)) {
*(u32 *)poid_par_priv->information_buf =
- padapter->recvpriv.rx_bytes;
+ adapter->recvpriv.rx_bytes;
*poid_par_priv->bytes_rw = poid_par_priv->
information_buf_len;
} else {
@@ -314,8 +314,8 @@ uint oid_rt_get_enc_key_match_count_hdl(struct oid_par_priv
uint oid_rt_get_channel_hdl(struct oid_par_priv *poid_par_priv)
{
- struct _adapter *padapter = poid_par_priv->adapter_context;
- struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
+ struct _adapter *adapter = poid_par_priv->adapter_context;
+ struct mlme_priv *pmlmepriv = &adapter->mlmepriv;
struct NDIS_802_11_CONFIGURATION *pnic_Config;
u32 channelnum;
@@ -325,7 +325,7 @@ uint oid_rt_get_channel_hdl(struct oid_par_priv *poid_par_priv)
check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE))
pnic_Config = &pmlmepriv->cur_network.network.Configuration;
else
- pnic_Config = &padapter->registrypriv.dev_network.
+ pnic_Config = &adapter->registrypriv.dev_network.
Configuration;
channelnum = pnic_Config->DSConfig;
*(u32 *)poid_par_priv->information_buf = channelnum;
@@ -437,13 +437,13 @@ uint oid_rt_pro_rf_write_registry_hdl(struct oid_par_priv*
poid_par_priv)
{
uint status = RNDIS_STATUS_SUCCESS;
- struct _adapter *Adapter = poid_par_priv->adapter_context;
+ struct _adapter *adapter = poid_par_priv->adapter_context;
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 (!r8712_setrfreg_cmd(Adapter,
+ if (!r8712_setrfreg_cmd(adapter,
*(unsigned char *)poid_par_priv->information_buf,
(unsigned long)(*((unsigned long *)
poid_par_priv->information_buf + 2))))
@@ -457,22 +457,22 @@ uint oid_rt_pro_rf_write_registry_hdl(struct oid_par_priv*
uint oid_rt_pro_rf_read_registry_hdl(struct oid_par_priv *poid_par_priv)
{
uint status = RNDIS_STATUS_SUCCESS;
- struct _adapter *Adapter = poid_par_priv->adapter_context;
+ struct _adapter *adapter = poid_par_priv->adapter_context;
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) {
+ if (adapter->mppriv.act_in_progress) {
status = RNDIS_STATUS_NOT_ACCEPTED;
} else {
/* init workparam */
- Adapter->mppriv.act_in_progress = true;
- Adapter->mppriv.workparam.bcompleted = false;
- Adapter->mppriv.workparam.act_type = MPT_READ_RF;
- Adapter->mppriv.workparam.io_offset = *(unsigned long *)
+ adapter->mppriv.act_in_progress = true;
+ adapter->mppriv.workparam.bcompleted = false;
+ adapter->mppriv.workparam.act_type = MPT_READ_RF;
+ adapter->mppriv.workparam.io_offset = *(unsigned long *)
poid_par_priv->information_buf;
- Adapter->mppriv.workparam.io_value = 0xcccccccc;
+ adapter->mppriv.workparam.io_value = 0xcccccccc;
/* RegOffsetValue - The offset of RF register to read.
* RegDataWidth - The data width of RF register to read.
@@ -481,9 +481,9 @@ uint oid_rt_pro_rf_read_registry_hdl(struct oid_par_priv *poid_par_priv)
* RegDataWidth = *((unsigned long *)InformationBuffer+1);
* RegDataValue = *((unsigned long *)InformationBuffer+2);
*/
- if (!r8712_getrfreg_cmd(Adapter,
+ if (!r8712_getrfreg_cmd(adapter,
*(unsigned char *)poid_par_priv->information_buf,
- (unsigned char *)&Adapter->mppriv.workparam.
+ (unsigned char *)&adapter->mppriv.workparam.
io_value))
status = RNDIS_STATUS_NOT_ACCEPTED;
}
@@ -502,8 +502,8 @@ enum _CONNECT_STATE_ {
uint oid_rt_get_connect_state_hdl(struct oid_par_priv *poid_par_priv)
{
- struct _adapter *padapter = poid_par_priv->adapter_context;
- struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
+ struct _adapter *adapter = poid_par_priv->adapter_context;
+ struct mlme_priv *pmlmepriv = &(adapter->mlmepriv);
u32 ulInfo;
if (poid_par_priv->type_of_oid != QUERY_OID)
--
2.6.3
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 3/4] staging: rtl8712: Make error handling check for failure
2015-11-24 12:19 [PATCH 0/4] staging: rtl8712: Cleanups for rtl871x_ioctl_rtl Mauro Dreissig
2015-11-24 12:19 ` [PATCH 1/4] staging: rtl8712: Remove casts between void * and type * Mauro Dreissig
2015-11-24 12:19 ` [PATCH 2/4] staging: rtl8712: Rename local variable Mauro Dreissig
@ 2015-11-24 12:19 ` Mauro Dreissig
2015-11-25 11:44 ` Sudip Mukherjee
2015-11-24 12:19 ` [PATCH 4/4] staging: rtl8712: Rename local variable Mauro Dreissig
3 siblings, 1 reply; 11+ messages in thread
From: Mauro Dreissig @ 2015-11-24 12:19 UTC (permalink / raw)
To: Larry.Finger, florian.c.schilhabel, gregkh, devel, netdev; +Cc: Mauro Dreissig
Some error handling paths are checking for success
instead of error on rtl871x_ioctl_rtl.c.
Signed-off-by: Mauro Dreissig <mukadr@gmail.com>
---
drivers/staging/rtl8712/rtl871x_ioctl_rtl.c | 239 ++++++++++++++--------------
1 file changed, 121 insertions(+), 118 deletions(-)
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_rtl.c b/drivers/staging/rtl8712/rtl871x_ioctl_rtl.c
index 97596aa..9317370 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_rtl.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_rtl.c
@@ -53,13 +53,13 @@ uint oid_rt_get_small_packet_crc_hdl(struct oid_par_priv *poid_par_priv)
if (poid_par_priv->type_of_oid != QUERY_OID)
return RNDIS_STATUS_NOT_ACCEPTED;
- if (poid_par_priv->information_buf_len >= sizeof(u32)) {
- *(u32 *)poid_par_priv->information_buf =
- adapter->recvpriv.rx_smallpacket_crcerr;
- *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
- } else {
+
+ if (poid_par_priv->information_buf_len < sizeof(u32))
return RNDIS_STATUS_INVALID_LENGTH;
- }
+
+ *(u32 *)poid_par_priv->information_buf = adapter->recvpriv.rx_smallpacket_crcerr;
+ *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
+
return RNDIS_STATUS_SUCCESS;
}
@@ -69,13 +69,13 @@ uint oid_rt_get_middle_packet_crc_hdl(struct oid_par_priv *poid_par_priv)
if (poid_par_priv->type_of_oid != QUERY_OID)
return RNDIS_STATUS_NOT_ACCEPTED;
- if (poid_par_priv->information_buf_len >= sizeof(u32)) {
- *(u32 *)poid_par_priv->information_buf =
- adapter->recvpriv.rx_middlepacket_crcerr;
- *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
- } else {
+
+ if (poid_par_priv->information_buf_len < sizeof(u32))
return RNDIS_STATUS_INVALID_LENGTH;
- }
+
+ *(u32 *)poid_par_priv->information_buf = adapter->recvpriv.rx_middlepacket_crcerr;
+ *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
+
return RNDIS_STATUS_SUCCESS;
}
@@ -85,13 +85,13 @@ uint oid_rt_get_large_packet_crc_hdl(struct oid_par_priv *poid_par_priv)
if (poid_par_priv->type_of_oid != QUERY_OID)
return RNDIS_STATUS_NOT_ACCEPTED;
- if (poid_par_priv->information_buf_len >= sizeof(u32)) {
- *(u32 *)poid_par_priv->information_buf =
- adapter->recvpriv.rx_largepacket_crcerr;
- *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
- } else {
+
+ if (poid_par_priv->information_buf_len < sizeof(u32))
return RNDIS_STATUS_INVALID_LENGTH;
- }
+
+ *(u32 *)poid_par_priv->information_buf = adapter->recvpriv.rx_largepacket_crcerr;
+ *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
+
return RNDIS_STATUS_SUCCESS;
}
@@ -116,14 +116,14 @@ uint oid_rt_get_rx_total_packet_hdl(struct oid_par_priv *poid_par_priv)
if (poid_par_priv->type_of_oid != QUERY_OID)
return RNDIS_STATUS_NOT_ACCEPTED;
- if (poid_par_priv->information_buf_len >= sizeof(u32)) {
- *(u32 *)poid_par_priv->information_buf =
- adapter->recvpriv.rx_pkts +
- adapter->recvpriv.rx_drop;
- *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
- } else {
+
+ if (poid_par_priv->information_buf_len < sizeof(u32))
return RNDIS_STATUS_INVALID_LENGTH;
- }
+
+ *(u32 *)poid_par_priv->information_buf =
+ adapter->recvpriv.rx_pkts + adapter->recvpriv.rx_drop;
+ *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
+
return RNDIS_STATUS_SUCCESS;
}
@@ -147,13 +147,13 @@ uint oid_rt_get_rx_icv_err_hdl(struct oid_par_priv *poid_par_priv)
if (poid_par_priv->type_of_oid != QUERY_OID)
return RNDIS_STATUS_NOT_ACCEPTED;
- if (poid_par_priv->information_buf_len >= sizeof(u32)) {
- *(uint *)poid_par_priv->information_buf =
- adapter->recvpriv.rx_icv_err;
- *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
- } else {
+
+ if (poid_par_priv->information_buf_len < sizeof(u32))
return RNDIS_STATUS_INVALID_LENGTH;
- }
+
+ *(uint *)poid_par_priv->information_buf = adapter->recvpriv.rx_icv_err;
+ *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
+
return RNDIS_STATUS_SUCCESS;
}
@@ -172,18 +172,20 @@ uint oid_rt_get_preamble_mode_hdl(struct oid_par_priv *poid_par_priv)
if (poid_par_priv->type_of_oid != QUERY_OID)
return RNDIS_STATUS_NOT_ACCEPTED;
- if (poid_par_priv->information_buf_len >= sizeof(u32)) {
- if (adapter->registrypriv.preamble == PREAMBLE_LONG)
- preamblemode = 0;
- else if (adapter->registrypriv.preamble == PREAMBLE_AUTO)
- preamblemode = 1;
- else if (adapter->registrypriv.preamble == PREAMBLE_SHORT)
- preamblemode = 2;
- *(u32 *)poid_par_priv->information_buf = preamblemode;
- *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
- } else {
+
+ if (poid_par_priv->information_buf_len < sizeof(u32))
return RNDIS_STATUS_INVALID_LENGTH;
- }
+
+ if (adapter->registrypriv.preamble == PREAMBLE_LONG)
+ preamblemode = 0;
+ else if (adapter->registrypriv.preamble == PREAMBLE_AUTO)
+ preamblemode = 1;
+ else if (adapter->registrypriv.preamble == PREAMBLE_SHORT)
+ preamblemode = 2;
+
+ *(u32 *)poid_par_priv->information_buf = preamblemode;
+ *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
+
return RNDIS_STATUS_SUCCESS;
}
@@ -201,8 +203,10 @@ uint oid_rt_get_channelplan_hdl(struct oid_par_priv *poid_par_priv)
if (poid_par_priv->type_of_oid != QUERY_OID)
return RNDIS_STATUS_NOT_ACCEPTED;
+
*poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
*(u16 *)poid_par_priv->information_buf = peeprompriv->channel_plan;
+
return RNDIS_STATUS_SUCCESS;
}
@@ -214,7 +218,9 @@ uint oid_rt_set_channelplan_hdl(struct oid_par_priv
if (poid_par_priv->type_of_oid != SET_OID)
return RNDIS_STATUS_NOT_ACCEPTED;
+
peeprompriv->channel_plan = *(u16 *)poid_par_priv->information_buf;
+
return RNDIS_STATUS_SUCCESS;
}
@@ -226,19 +232,21 @@ uint oid_rt_set_preamble_mode_hdl(struct oid_par_priv
if (poid_par_priv->type_of_oid != SET_OID)
return RNDIS_STATUS_NOT_ACCEPTED;
- if (poid_par_priv->information_buf_len >= sizeof(u32)) {
- preamblemode = *(u32 *)poid_par_priv->information_buf;
- if (preamblemode == 0)
- adapter->registrypriv.preamble = PREAMBLE_LONG;
- else if (preamblemode == 1)
- adapter->registrypriv.preamble = PREAMBLE_AUTO;
- else if (preamblemode == 2)
- adapter->registrypriv.preamble = PREAMBLE_SHORT;
- *(u32 *)poid_par_priv->information_buf = preamblemode;
- *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
- } else {
+
+ if (poid_par_priv->information_buf_len < sizeof(u32))
return RNDIS_STATUS_INVALID_LENGTH;
- }
+
+ preamblemode = *(u32 *)poid_par_priv->information_buf;
+ if (preamblemode == 0)
+ adapter->registrypriv.preamble = PREAMBLE_LONG;
+ else if (preamblemode == 1)
+ adapter->registrypriv.preamble = PREAMBLE_AUTO;
+ else if (preamblemode == 2)
+ adapter->registrypriv.preamble = PREAMBLE_SHORT;
+
+ *(u32 *)poid_par_priv->information_buf = preamblemode;
+ *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
+
return RNDIS_STATUS_SUCCESS;
}
@@ -262,13 +270,13 @@ uint oid_rt_get_total_tx_bytes_hdl(struct oid_par_priv
if (poid_par_priv->type_of_oid != QUERY_OID)
return RNDIS_STATUS_NOT_ACCEPTED;
- if (poid_par_priv->information_buf_len >= sizeof(u32)) {
- *(u32 *)poid_par_priv->information_buf =
- adapter->xmitpriv.tx_bytes;
- *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
- } else {
+
+ if (poid_par_priv->information_buf_len < sizeof(u32))
return RNDIS_STATUS_INVALID_LENGTH;
- }
+
+ *(u32 *)poid_par_priv->information_buf = adapter->xmitpriv.tx_bytes;
+ *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
+
return RNDIS_STATUS_SUCCESS;
}
@@ -279,14 +287,13 @@ uint oid_rt_get_total_rx_bytes_hdl(struct oid_par_priv
if (poid_par_priv->type_of_oid != QUERY_OID)
return RNDIS_STATUS_NOT_ACCEPTED;
- if (poid_par_priv->information_buf_len >= sizeof(u32)) {
- *(u32 *)poid_par_priv->information_buf =
- adapter->recvpriv.rx_bytes;
- *poid_par_priv->bytes_rw = poid_par_priv->
- information_buf_len;
- } else {
+
+ if (poid_par_priv->information_buf_len < sizeof(u32))
return RNDIS_STATUS_INVALID_LENGTH;
- }
+
+ *(u32 *)poid_par_priv->information_buf = adapter->recvpriv.rx_bytes;
+ *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
+
return RNDIS_STATUS_SUCCESS;
}
@@ -355,15 +362,16 @@ uint oid_rt_supported_wireless_mode_hdl(struct oid_par_priv
if (poid_par_priv->type_of_oid != QUERY_OID)
return RNDIS_STATUS_NOT_ACCEPTED;
- if (poid_par_priv->information_buf_len >= sizeof(u32)) {
- ulInfo |= 0x0100; /* WIRELESS_MODE_B */
- ulInfo |= 0x0200; /* WIRELESS_MODE_G */
- ulInfo |= 0x0400; /* WIRELESS_MODE_A */
- *(u32 *) poid_par_priv->information_buf = ulInfo;
- *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
- } else {
+
+ if (poid_par_priv->information_buf_len < sizeof(u32))
return RNDIS_STATUS_INVALID_LENGTH;
- }
+
+ ulInfo |= 0x0100; /* WIRELESS_MODE_B */
+ ulInfo |= 0x0200; /* WIRELESS_MODE_G */
+ ulInfo |= 0x0400; /* WIRELESS_MODE_A */
+ *(u32 *) poid_par_priv->information_buf = ulInfo;
+ *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
+
return RNDIS_STATUS_SUCCESS;
}
@@ -436,61 +444,56 @@ uint oid_rt_ap_set_passphrase_hdl(struct oid_par_priv *poid_par_priv)
uint oid_rt_pro_rf_write_registry_hdl(struct oid_par_priv*
poid_par_priv)
{
- uint status = RNDIS_STATUS_SUCCESS;
struct _adapter *adapter = poid_par_priv->adapter_context;
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 (!r8712_setrfreg_cmd(adapter,
- *(unsigned char *)poid_par_priv->information_buf,
- (unsigned long)(*((unsigned long *)
- poid_par_priv->information_buf + 2))))
- status = RNDIS_STATUS_NOT_ACCEPTED;
- } else {
- status = RNDIS_STATUS_INVALID_LENGTH;
- }
- return status;
+
+ if (poid_par_priv->information_buf_len != (sizeof(unsigned long) * 3))
+ return RNDIS_STATUS_INVALID_LENGTH;
+
+ if (!r8712_setrfreg_cmd(adapter,
+ *(unsigned char *)poid_par_priv->information_buf,
+ (unsigned long)(*((unsigned long *)poid_par_priv->information_buf + 2))))
+ return RNDIS_STATUS_NOT_ACCEPTED;
+
+ return RNDIS_STATUS_SUCCESS;
}
uint oid_rt_pro_rf_read_registry_hdl(struct oid_par_priv *poid_par_priv)
{
- uint status = RNDIS_STATUS_SUCCESS;
struct _adapter *adapter = poid_par_priv->adapter_context;
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) {
- status = RNDIS_STATUS_NOT_ACCEPTED;
- } else {
- /* init workparam */
- adapter->mppriv.act_in_progress = true;
- adapter->mppriv.workparam.bcompleted = false;
- adapter->mppriv.workparam.act_type = MPT_READ_RF;
- adapter->mppriv.workparam.io_offset = *(unsigned long *)
- poid_par_priv->information_buf;
- adapter->mppriv.workparam.io_value = 0xcccccccc;
-
- /* RegOffsetValue - The offset of RF register to read.
- * RegDataWidth - The data width of RF register to read.
- * RegDataValue - The value to read.
- * RegOffsetValue = *((unsigned long *)InformationBuffer);
- * RegDataWidth = *((unsigned long *)InformationBuffer+1);
- * RegDataValue = *((unsigned long *)InformationBuffer+2);
- */
- if (!r8712_getrfreg_cmd(adapter,
- *(unsigned char *)poid_par_priv->information_buf,
- (unsigned char *)&adapter->mppriv.workparam.
- io_value))
- status = RNDIS_STATUS_NOT_ACCEPTED;
- }
- } else {
- status = RNDIS_STATUS_INVALID_LENGTH;
- }
- return status;
+
+ if (poid_par_priv->information_buf_len != (sizeof(unsigned long) * 3))
+ return RNDIS_STATUS_INVALID_LENGTH;
+
+ if (adapter->mppriv.act_in_progress)
+ return RNDIS_STATUS_NOT_ACCEPTED;
+
+ /* init workparam */
+ adapter->mppriv.act_in_progress = true;
+ adapter->mppriv.workparam.bcompleted = false;
+ adapter->mppriv.workparam.act_type = MPT_READ_RF;
+ adapter->mppriv.workparam.io_offset = *(unsigned long *)
+ poid_par_priv->information_buf;
+ adapter->mppriv.workparam.io_value = 0xcccccccc;
+
+ /* RegOffsetValue - The offset of RF register to read.
+ * RegDataWidth - The data width of RF register to read.
+ * RegDataValue - The value to read.
+ * RegOffsetValue = *((unsigned long *)InformationBuffer);
+ * RegDataWidth = *((unsigned long *)InformationBuffer+1);
+ * RegDataValue = *((unsigned long *)InformationBuffer+2);
+ */
+ if (!r8712_getrfreg_cmd(adapter,
+ *(unsigned char *)poid_par_priv->information_buf,
+ (unsigned char *)&adapter->mppriv.workparam.io_value))
+ return RNDIS_STATUS_NOT_ACCEPTED;
+
+ return RNDIS_STATUS_SUCCESS;
}
enum _CONNECT_STATE_ {
--
2.6.3
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 4/4] staging: rtl8712: Rename local variable
2015-11-24 12:19 [PATCH 0/4] staging: rtl8712: Cleanups for rtl871x_ioctl_rtl Mauro Dreissig
` (2 preceding siblings ...)
2015-11-24 12:19 ` [PATCH 3/4] staging: rtl8712: Make error handling check for failure Mauro Dreissig
@ 2015-11-24 12:19 ` Mauro Dreissig
3 siblings, 0 replies; 11+ messages in thread
From: Mauro Dreissig @ 2015-11-24 12:19 UTC (permalink / raw)
To: Larry.Finger, florian.c.schilhabel, gregkh, devel, netdev; +Cc: Mauro Dreissig
Make all instances of struct oid_par_priv be called oid
in rtl871x_ioctl_rtl.c and rtl871x_ioctl_rtl.h.
Signed-off-by: Mauro Dreissig <mukadr@gmail.com>
---
drivers/staging/rtl8712/rtl871x_ioctl_rtl.c | 287 +++++++++++++---------------
drivers/staging/rtl8712/rtl871x_ioctl_rtl.h | 123 ++++--------
2 files changed, 176 insertions(+), 234 deletions(-)
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_rtl.c b/drivers/staging/rtl8712/rtl871x_ioctl_rtl.c
index 9317370..3bbca78 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_rtl.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_rtl.c
@@ -40,140 +40,139 @@
#include "rtl871x_mp.h"
#include "rtl871x_mp_ioctl.h"
-uint oid_rt_get_signal_quality_hdl(struct oid_par_priv *poid_par_priv)
+uint oid_rt_get_signal_quality_hdl(struct oid_par_priv *oid)
{
- if (poid_par_priv->type_of_oid != QUERY_OID)
+ if (oid->type_of_oid != QUERY_OID)
return RNDIS_STATUS_NOT_ACCEPTED;
return RNDIS_STATUS_SUCCESS;
}
-uint oid_rt_get_small_packet_crc_hdl(struct oid_par_priv *poid_par_priv)
+uint oid_rt_get_small_packet_crc_hdl(struct oid_par_priv *oid)
{
- struct _adapter *adapter = poid_par_priv->adapter_context;
+ struct _adapter *adapter = oid->adapter_context;
- if (poid_par_priv->type_of_oid != QUERY_OID)
+ if (oid->type_of_oid != QUERY_OID)
return RNDIS_STATUS_NOT_ACCEPTED;
- if (poid_par_priv->information_buf_len < sizeof(u32))
+ if (oid->information_buf_len < sizeof(u32))
return RNDIS_STATUS_INVALID_LENGTH;
- *(u32 *)poid_par_priv->information_buf = adapter->recvpriv.rx_smallpacket_crcerr;
- *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
+ *(u32 *)oid->information_buf = adapter->recvpriv.rx_smallpacket_crcerr;
+ *oid->bytes_rw = oid->information_buf_len;
return RNDIS_STATUS_SUCCESS;
}
-uint oid_rt_get_middle_packet_crc_hdl(struct oid_par_priv *poid_par_priv)
+uint oid_rt_get_middle_packet_crc_hdl(struct oid_par_priv *oid)
{
- struct _adapter *adapter = poid_par_priv->adapter_context;
+ struct _adapter *adapter = oid->adapter_context;
- if (poid_par_priv->type_of_oid != QUERY_OID)
+ if (oid->type_of_oid != QUERY_OID)
return RNDIS_STATUS_NOT_ACCEPTED;
- if (poid_par_priv->information_buf_len < sizeof(u32))
+ if (oid->information_buf_len < sizeof(u32))
return RNDIS_STATUS_INVALID_LENGTH;
- *(u32 *)poid_par_priv->information_buf = adapter->recvpriv.rx_middlepacket_crcerr;
- *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
+ *(u32 *)oid->information_buf = adapter->recvpriv.rx_middlepacket_crcerr;
+ *oid->bytes_rw = oid->information_buf_len;
return RNDIS_STATUS_SUCCESS;
}
-uint oid_rt_get_large_packet_crc_hdl(struct oid_par_priv *poid_par_priv)
+uint oid_rt_get_large_packet_crc_hdl(struct oid_par_priv *oid)
{
- struct _adapter *adapter = poid_par_priv->adapter_context;
+ struct _adapter *adapter = oid->adapter_context;
- if (poid_par_priv->type_of_oid != QUERY_OID)
+ if (oid->type_of_oid != QUERY_OID)
return RNDIS_STATUS_NOT_ACCEPTED;
- if (poid_par_priv->information_buf_len < sizeof(u32))
+ if (oid->information_buf_len < sizeof(u32))
return RNDIS_STATUS_INVALID_LENGTH;
- *(u32 *)poid_par_priv->information_buf = adapter->recvpriv.rx_largepacket_crcerr;
- *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
+ *(u32 *)oid->information_buf = adapter->recvpriv.rx_largepacket_crcerr;
+ *oid->bytes_rw = oid->information_buf_len;
return RNDIS_STATUS_SUCCESS;
}
-uint oid_rt_get_tx_retry_hdl(struct oid_par_priv *poid_par_priv)
+uint oid_rt_get_tx_retry_hdl(struct oid_par_priv *oid)
{
- if (poid_par_priv->type_of_oid != QUERY_OID)
+ if (oid->type_of_oid != QUERY_OID)
return RNDIS_STATUS_NOT_ACCEPTED;
return RNDIS_STATUS_SUCCESS;
}
-uint oid_rt_get_rx_retry_hdl(struct oid_par_priv *poid_par_priv)
+uint oid_rt_get_rx_retry_hdl(struct oid_par_priv *oid)
{
- if (poid_par_priv->type_of_oid != QUERY_OID)
+ if (oid->type_of_oid != QUERY_OID)
return RNDIS_STATUS_NOT_ACCEPTED;
- *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
+ *oid->bytes_rw = oid->information_buf_len;
return RNDIS_STATUS_SUCCESS;
}
-uint oid_rt_get_rx_total_packet_hdl(struct oid_par_priv *poid_par_priv)
+uint oid_rt_get_rx_total_packet_hdl(struct oid_par_priv *oid)
{
- struct _adapter *adapter = poid_par_priv->adapter_context;
+ struct _adapter *adapter = oid->adapter_context;
- if (poid_par_priv->type_of_oid != QUERY_OID)
+ if (oid->type_of_oid != QUERY_OID)
return RNDIS_STATUS_NOT_ACCEPTED;
- if (poid_par_priv->information_buf_len < sizeof(u32))
+ if (oid->information_buf_len < sizeof(u32))
return RNDIS_STATUS_INVALID_LENGTH;
- *(u32 *)poid_par_priv->information_buf =
+ *(u32 *)oid->information_buf =
adapter->recvpriv.rx_pkts + adapter->recvpriv.rx_drop;
- *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
+ *oid->bytes_rw = oid->information_buf_len;
return RNDIS_STATUS_SUCCESS;
}
-uint oid_rt_get_tx_beacon_ok_hdl(struct oid_par_priv *poid_par_priv)
+uint oid_rt_get_tx_beacon_ok_hdl(struct oid_par_priv *oid)
{
- if (poid_par_priv->type_of_oid != QUERY_OID)
+ if (oid->type_of_oid != QUERY_OID)
return RNDIS_STATUS_NOT_ACCEPTED;
return RNDIS_STATUS_SUCCESS;
}
-uint oid_rt_get_tx_beacon_err_hdl(struct oid_par_priv *poid_par_priv)
+uint oid_rt_get_tx_beacon_err_hdl(struct oid_par_priv *oid)
{
- if (poid_par_priv->type_of_oid != QUERY_OID)
+ if (oid->type_of_oid != QUERY_OID)
return RNDIS_STATUS_NOT_ACCEPTED;
return RNDIS_STATUS_SUCCESS;
}
-uint oid_rt_get_rx_icv_err_hdl(struct oid_par_priv *poid_par_priv)
+uint oid_rt_get_rx_icv_err_hdl(struct oid_par_priv *oid)
{
- struct _adapter *adapter = poid_par_priv->adapter_context;
+ struct _adapter *adapter = oid->adapter_context;
- if (poid_par_priv->type_of_oid != QUERY_OID)
+ if (oid->type_of_oid != QUERY_OID)
return RNDIS_STATUS_NOT_ACCEPTED;
- if (poid_par_priv->information_buf_len < sizeof(u32))
+ if (oid->information_buf_len < sizeof(u32))
return RNDIS_STATUS_INVALID_LENGTH;
- *(uint *)poid_par_priv->information_buf = adapter->recvpriv.rx_icv_err;
- *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
+ *(uint *)oid->information_buf = adapter->recvpriv.rx_icv_err;
+ *oid->bytes_rw = oid->information_buf_len;
return RNDIS_STATUS_SUCCESS;
}
-uint oid_rt_set_encryption_algorithm_hdl(struct oid_par_priv
- *poid_par_priv)
+uint oid_rt_set_encryption_algorithm_hdl(struct oid_par_priv *oid)
{
- if (poid_par_priv->type_of_oid != SET_OID)
+ if (oid->type_of_oid != SET_OID)
return RNDIS_STATUS_NOT_ACCEPTED;
return RNDIS_STATUS_SUCCESS;
}
-uint oid_rt_get_preamble_mode_hdl(struct oid_par_priv *poid_par_priv)
+uint oid_rt_get_preamble_mode_hdl(struct oid_par_priv *oid)
{
- struct _adapter *adapter = poid_par_priv->adapter_context;
+ struct _adapter *adapter = oid->adapter_context;
u32 preamblemode = 0;
- if (poid_par_priv->type_of_oid != QUERY_OID)
+ if (oid->type_of_oid != QUERY_OID)
return RNDIS_STATUS_NOT_ACCEPTED;
- if (poid_par_priv->information_buf_len < sizeof(u32))
+ if (oid->information_buf_len < sizeof(u32))
return RNDIS_STATUS_INVALID_LENGTH;
if (adapter->registrypriv.preamble == PREAMBLE_LONG)
@@ -183,60 +182,58 @@ uint oid_rt_get_preamble_mode_hdl(struct oid_par_priv *poid_par_priv)
else if (adapter->registrypriv.preamble == PREAMBLE_SHORT)
preamblemode = 2;
- *(u32 *)poid_par_priv->information_buf = preamblemode;
- *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
+ *(u32 *)oid->information_buf = preamblemode;
+ *oid->bytes_rw = oid->information_buf_len;
return RNDIS_STATUS_SUCCESS;
}
-uint oid_rt_get_ap_ip_hdl(struct oid_par_priv *poid_par_priv)
+uint oid_rt_get_ap_ip_hdl(struct oid_par_priv *oid)
{
- if (poid_par_priv->type_of_oid != QUERY_OID)
+ if (oid->type_of_oid != QUERY_OID)
return RNDIS_STATUS_NOT_ACCEPTED;
return RNDIS_STATUS_SUCCESS;
}
-uint oid_rt_get_channelplan_hdl(struct oid_par_priv *poid_par_priv)
+uint oid_rt_get_channelplan_hdl(struct oid_par_priv *oid)
{
- struct _adapter *adapter = poid_par_priv->adapter_context;
+ struct _adapter *adapter = oid->adapter_context;
struct eeprom_priv *peeprompriv = &adapter->eeprompriv;
- if (poid_par_priv->type_of_oid != QUERY_OID)
+ if (oid->type_of_oid != QUERY_OID)
return RNDIS_STATUS_NOT_ACCEPTED;
- *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
- *(u16 *)poid_par_priv->information_buf = peeprompriv->channel_plan;
+ *oid->bytes_rw = oid->information_buf_len;
+ *(u16 *)oid->information_buf = peeprompriv->channel_plan;
return RNDIS_STATUS_SUCCESS;
}
-uint oid_rt_set_channelplan_hdl(struct oid_par_priv
- *poid_par_priv)
+uint oid_rt_set_channelplan_hdl(struct oid_par_priv *oid)
{
- struct _adapter *adapter = poid_par_priv->adapter_context;
+ struct _adapter *adapter = oid->adapter_context;
struct eeprom_priv *peeprompriv = &adapter->eeprompriv;
- if (poid_par_priv->type_of_oid != SET_OID)
+ if (oid->type_of_oid != SET_OID)
return RNDIS_STATUS_NOT_ACCEPTED;
- peeprompriv->channel_plan = *(u16 *)poid_par_priv->information_buf;
+ peeprompriv->channel_plan = *(u16 *)oid->information_buf;
return RNDIS_STATUS_SUCCESS;
}
-uint oid_rt_set_preamble_mode_hdl(struct oid_par_priv
- *poid_par_priv)
+uint oid_rt_set_preamble_mode_hdl(struct oid_par_priv *oid)
{
- struct _adapter *adapter = poid_par_priv->adapter_context;
+ struct _adapter *adapter = oid->adapter_context;
u32 preamblemode = 0;
- if (poid_par_priv->type_of_oid != SET_OID)
+ if (oid->type_of_oid != SET_OID)
return RNDIS_STATUS_NOT_ACCEPTED;
- if (poid_par_priv->information_buf_len < sizeof(u32))
+ if (oid->information_buf_len < sizeof(u32))
return RNDIS_STATUS_INVALID_LENGTH;
- preamblemode = *(u32 *)poid_par_priv->information_buf;
+ preamblemode = *(u32 *)oid->information_buf;
if (preamblemode == 0)
adapter->registrypriv.preamble = PREAMBLE_LONG;
else if (preamblemode == 1)
@@ -244,89 +241,83 @@ uint oid_rt_set_preamble_mode_hdl(struct oid_par_priv
else if (preamblemode == 2)
adapter->registrypriv.preamble = PREAMBLE_SHORT;
- *(u32 *)poid_par_priv->information_buf = preamblemode;
- *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
+ *(u32 *)oid->information_buf = preamblemode;
+ *oid->bytes_rw = oid->information_buf_len;
return RNDIS_STATUS_SUCCESS;
}
-uint oid_rt_set_bcn_intvl_hdl(struct oid_par_priv *poid_par_priv)
+uint oid_rt_set_bcn_intvl_hdl(struct oid_par_priv *oid)
{
- if (poid_par_priv->type_of_oid != SET_OID)
+ if (oid->type_of_oid != SET_OID)
return RNDIS_STATUS_NOT_ACCEPTED;
return RNDIS_STATUS_SUCCESS;
}
-uint oid_rt_dedicate_probe_hdl(struct oid_par_priv
- *poid_par_priv)
+uint oid_rt_dedicate_probe_hdl(struct oid_par_priv *oid)
{
return RNDIS_STATUS_SUCCESS;
}
-uint oid_rt_get_total_tx_bytes_hdl(struct oid_par_priv
- *poid_par_priv)
+uint oid_rt_get_total_tx_bytes_hdl(struct oid_par_priv *oid)
{
- struct _adapter *adapter = poid_par_priv->adapter_context;
+ struct _adapter *adapter = oid->adapter_context;
- if (poid_par_priv->type_of_oid != QUERY_OID)
+ if (oid->type_of_oid != QUERY_OID)
return RNDIS_STATUS_NOT_ACCEPTED;
- if (poid_par_priv->information_buf_len < sizeof(u32))
+ if (oid->information_buf_len < sizeof(u32))
return RNDIS_STATUS_INVALID_LENGTH;
- *(u32 *)poid_par_priv->information_buf = adapter->xmitpriv.tx_bytes;
- *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
+ *(u32 *)oid->information_buf = adapter->xmitpriv.tx_bytes;
+ *oid->bytes_rw = oid->information_buf_len;
return RNDIS_STATUS_SUCCESS;
}
-uint oid_rt_get_total_rx_bytes_hdl(struct oid_par_priv
- *poid_par_priv)
+uint oid_rt_get_total_rx_bytes_hdl(struct oid_par_priv *oid)
{
- struct _adapter *adapter = poid_par_priv->adapter_context;
+ struct _adapter *adapter = oid->adapter_context;
- if (poid_par_priv->type_of_oid != QUERY_OID)
+ if (oid->type_of_oid != QUERY_OID)
return RNDIS_STATUS_NOT_ACCEPTED;
- if (poid_par_priv->information_buf_len < sizeof(u32))
+ if (oid->information_buf_len < sizeof(u32))
return RNDIS_STATUS_INVALID_LENGTH;
- *(u32 *)poid_par_priv->information_buf = adapter->recvpriv.rx_bytes;
- *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
+ *(u32 *)oid->information_buf = adapter->recvpriv.rx_bytes;
+ *oid->bytes_rw = oid->information_buf_len;
return RNDIS_STATUS_SUCCESS;
}
-uint oid_rt_current_tx_power_level_hdl(struct oid_par_priv
- *poid_par_priv)
+uint oid_rt_current_tx_power_level_hdl(struct oid_par_priv *oid)
{
return RNDIS_STATUS_SUCCESS;
}
-uint oid_rt_get_enc_key_mismatch_count_hdl(struct oid_par_priv
- *poid_par_priv)
+uint oid_rt_get_enc_key_mismatch_count_hdl(struct oid_par_priv *oid)
{
- if (poid_par_priv->type_of_oid != QUERY_OID)
+ if (oid->type_of_oid != QUERY_OID)
return RNDIS_STATUS_NOT_ACCEPTED;
return RNDIS_STATUS_SUCCESS;
}
-uint oid_rt_get_enc_key_match_count_hdl(struct oid_par_priv
- *poid_par_priv)
+uint oid_rt_get_enc_key_match_count_hdl(struct oid_par_priv *oid)
{
- if (poid_par_priv->type_of_oid != QUERY_OID)
+ if (oid->type_of_oid != QUERY_OID)
return RNDIS_STATUS_NOT_ACCEPTED;
return RNDIS_STATUS_SUCCESS;
}
-uint oid_rt_get_channel_hdl(struct oid_par_priv *poid_par_priv)
+uint oid_rt_get_channel_hdl(struct oid_par_priv *oid)
{
- struct _adapter *adapter = poid_par_priv->adapter_context;
+ struct _adapter *adapter = oid->adapter_context;
struct mlme_priv *pmlmepriv = &adapter->mlmepriv;
struct NDIS_802_11_CONFIGURATION *pnic_Config;
u32 channelnum;
- if (poid_par_priv->type_of_oid != QUERY_OID)
+ if (oid->type_of_oid != QUERY_OID)
return RNDIS_STATUS_NOT_ACCEPTED;
if (check_fwstate(pmlmepriv, _FW_LINKED) ||
check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE))
@@ -335,139 +326,131 @@ uint oid_rt_get_channel_hdl(struct oid_par_priv *poid_par_priv)
pnic_Config = &adapter->registrypriv.dev_network.
Configuration;
channelnum = pnic_Config->DSConfig;
- *(u32 *)poid_par_priv->information_buf = channelnum;
- *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
+ *(u32 *)oid->information_buf = channelnum;
+ *oid->bytes_rw = oid->information_buf_len;
return RNDIS_STATUS_SUCCESS;
}
-uint oid_rt_get_hardware_radio_off_hdl(struct oid_par_priv
- *poid_par_priv)
+uint oid_rt_get_hardware_radio_off_hdl(struct oid_par_priv *oid)
{
- if (poid_par_priv->type_of_oid != QUERY_OID)
+ if (oid->type_of_oid != QUERY_OID)
return RNDIS_STATUS_NOT_ACCEPTED;
return RNDIS_STATUS_SUCCESS;
}
-uint oid_rt_get_key_mismatch_hdl(struct oid_par_priv *poid_par_priv)
+uint oid_rt_get_key_mismatch_hdl(struct oid_par_priv *oid)
{
- if (poid_par_priv->type_of_oid != QUERY_OID)
+ if (oid->type_of_oid != QUERY_OID)
return RNDIS_STATUS_NOT_ACCEPTED;
return RNDIS_STATUS_SUCCESS;
}
-uint oid_rt_supported_wireless_mode_hdl(struct oid_par_priv
- *poid_par_priv)
+uint oid_rt_supported_wireless_mode_hdl(struct oid_par_priv *oid)
{
u32 ulInfo = 0;
- if (poid_par_priv->type_of_oid != QUERY_OID)
+ if (oid->type_of_oid != QUERY_OID)
return RNDIS_STATUS_NOT_ACCEPTED;
- if (poid_par_priv->information_buf_len < sizeof(u32))
+ if (oid->information_buf_len < sizeof(u32))
return RNDIS_STATUS_INVALID_LENGTH;
ulInfo |= 0x0100; /* WIRELESS_MODE_B */
ulInfo |= 0x0200; /* WIRELESS_MODE_G */
ulInfo |= 0x0400; /* WIRELESS_MODE_A */
- *(u32 *) poid_par_priv->information_buf = ulInfo;
- *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
+ *(u32 *) oid->information_buf = ulInfo;
+ *oid->bytes_rw = oid->information_buf_len;
return RNDIS_STATUS_SUCCESS;
}
-uint oid_rt_get_channel_list_hdl(struct oid_par_priv *poid_par_priv)
+uint oid_rt_get_channel_list_hdl(struct oid_par_priv *oid)
{
- if (poid_par_priv->type_of_oid != QUERY_OID)
+ if (oid->type_of_oid != QUERY_OID)
return RNDIS_STATUS_NOT_ACCEPTED;
return RNDIS_STATUS_SUCCESS;
}
-uint oid_rt_get_scan_in_progress_hdl(struct oid_par_priv *poid_par_priv)
+uint oid_rt_get_scan_in_progress_hdl(struct oid_par_priv *oid)
{
- if (poid_par_priv->type_of_oid != QUERY_OID)
+ if (oid->type_of_oid != QUERY_OID)
return RNDIS_STATUS_NOT_ACCEPTED;
return RNDIS_STATUS_SUCCESS;
}
-uint oid_rt_forced_data_rate_hdl(struct oid_par_priv *poid_par_priv)
+uint oid_rt_forced_data_rate_hdl(struct oid_par_priv *oid)
{
return RNDIS_STATUS_SUCCESS;
}
-uint oid_rt_wireless_mode_for_scan_list_hdl(struct oid_par_priv
- *poid_par_priv)
+uint oid_rt_wireless_mode_for_scan_list_hdl(struct oid_par_priv *oid)
{
return RNDIS_STATUS_SUCCESS;
}
-uint oid_rt_get_bss_wireless_mode_hdl(struct oid_par_priv
- *poid_par_priv)
+uint oid_rt_get_bss_wireless_mode_hdl(struct oid_par_priv *oid)
{
- if (poid_par_priv->type_of_oid != QUERY_OID)
+ if (oid->type_of_oid != QUERY_OID)
return RNDIS_STATUS_NOT_ACCEPTED;
return RNDIS_STATUS_SUCCESS;
}
-uint oid_rt_scan_with_magic_packet_hdl(struct oid_par_priv
- *poid_par_priv)
+uint oid_rt_scan_with_magic_packet_hdl(struct oid_par_priv *oid)
{
return RNDIS_STATUS_SUCCESS;
}
-uint oid_rt_ap_get_associated_station_list_hdl(struct oid_par_priv
- *poid_par_priv)
+uint oid_rt_ap_get_associated_station_list_hdl(struct oid_par_priv *oid)
{
- if (poid_par_priv->type_of_oid != QUERY_OID)
+ if (oid->type_of_oid != QUERY_OID)
return RNDIS_STATUS_NOT_ACCEPTED;
return RNDIS_STATUS_SUCCESS;
}
-uint oid_rt_ap_switch_into_ap_mode_hdl(struct oid_par_priv*
- poid_par_priv)
+uint oid_rt_ap_switch_into_ap_mode_hdl(struct oid_par_priv *oid)
{
return RNDIS_STATUS_SUCCESS;
}
-uint oid_rt_ap_supported_hdl(struct oid_par_priv *poid_par_priv)
+uint oid_rt_ap_supported_hdl(struct oid_par_priv *oid)
{
return RNDIS_STATUS_SUCCESS;
}
-uint oid_rt_ap_set_passphrase_hdl(struct oid_par_priv *poid_par_priv)
+uint oid_rt_ap_set_passphrase_hdl(struct oid_par_priv *oid)
{
- if (poid_par_priv->type_of_oid != SET_OID)
+ if (oid->type_of_oid != SET_OID)
return RNDIS_STATUS_NOT_ACCEPTED;
return RNDIS_STATUS_SUCCESS;
}
-uint oid_rt_pro_rf_write_registry_hdl(struct oid_par_priv*
- poid_par_priv)
+uint oid_rt_pro_rf_write_registry_hdl(struct oid_par_priv *oid)
{
- struct _adapter *adapter = poid_par_priv->adapter_context;
+ struct _adapter *adapter = oid->adapter_context;
- if (poid_par_priv->type_of_oid != SET_OID) /* QUERY_OID */
+ if (oid->type_of_oid != SET_OID) /* QUERY_OID */
return RNDIS_STATUS_NOT_ACCEPTED;
- if (poid_par_priv->information_buf_len != (sizeof(unsigned long) * 3))
+ if (oid->information_buf_len != (sizeof(unsigned long) * 3))
return RNDIS_STATUS_INVALID_LENGTH;
if (!r8712_setrfreg_cmd(adapter,
- *(unsigned char *)poid_par_priv->information_buf,
- (unsigned long)(*((unsigned long *)poid_par_priv->information_buf + 2))))
+ *(unsigned char *)oid->information_buf,
+ (unsigned long)(*((unsigned long *)oid->information_buf + 2))))
return RNDIS_STATUS_NOT_ACCEPTED;
return RNDIS_STATUS_SUCCESS;
}
-uint oid_rt_pro_rf_read_registry_hdl(struct oid_par_priv *poid_par_priv)
+uint oid_rt_pro_rf_read_registry_hdl(struct oid_par_priv *oid)
{
- struct _adapter *adapter = poid_par_priv->adapter_context;
+ struct _adapter *adapter = oid->adapter_context;
- if (poid_par_priv->type_of_oid != SET_OID) /* QUERY_OID */
+ if (oid->type_of_oid != SET_OID) /* QUERY_OID */
return RNDIS_STATUS_NOT_ACCEPTED;
- if (poid_par_priv->information_buf_len != (sizeof(unsigned long) * 3))
+ if (oid->information_buf_len != (sizeof(unsigned long) * 3))
return RNDIS_STATUS_INVALID_LENGTH;
if (adapter->mppriv.act_in_progress)
@@ -478,7 +461,7 @@ uint oid_rt_pro_rf_read_registry_hdl(struct oid_par_priv *poid_par_priv)
adapter->mppriv.workparam.bcompleted = false;
adapter->mppriv.workparam.act_type = MPT_READ_RF;
adapter->mppriv.workparam.io_offset = *(unsigned long *)
- poid_par_priv->information_buf;
+ oid->information_buf;
adapter->mppriv.workparam.io_value = 0xcccccccc;
/* RegOffsetValue - The offset of RF register to read.
@@ -489,7 +472,7 @@ uint oid_rt_pro_rf_read_registry_hdl(struct oid_par_priv *poid_par_priv)
* RegDataValue = *((unsigned long *)InformationBuffer+2);
*/
if (!r8712_getrfreg_cmd(adapter,
- *(unsigned char *)poid_par_priv->information_buf,
+ *(unsigned char *)oid->information_buf,
(unsigned char *)&adapter->mppriv.workparam.io_value))
return RNDIS_STATUS_NOT_ACCEPTED;
@@ -503,13 +486,13 @@ enum _CONNECT_STATE_ {
NOTASSOCIATED
};
-uint oid_rt_get_connect_state_hdl(struct oid_par_priv *poid_par_priv)
+uint oid_rt_get_connect_state_hdl(struct oid_par_priv *oid)
{
- struct _adapter *adapter = poid_par_priv->adapter_context;
+ struct _adapter *adapter = oid->adapter_context;
struct mlme_priv *pmlmepriv = &(adapter->mlmepriv);
u32 ulInfo;
- if (poid_par_priv->type_of_oid != QUERY_OID)
+ if (oid->type_of_oid != QUERY_OID)
return RNDIS_STATUS_NOT_ACCEPTED;
/* nStatus==0 CheckingStatus
* nStatus==1 Associated
@@ -524,14 +507,14 @@ uint oid_rt_get_connect_state_hdl(struct oid_par_priv *poid_par_priv)
ulInfo = ADHOCMODE;
else
ulInfo = NOTASSOCIATED;
- *(u32 *)poid_par_priv->information_buf = ulInfo;
- *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
+ *(u32 *)oid->information_buf = ulInfo;
+ *oid->bytes_rw = oid->information_buf_len;
return RNDIS_STATUS_SUCCESS;
}
-uint oid_rt_set_default_key_id_hdl(struct oid_par_priv *poid_par_priv)
+uint oid_rt_set_default_key_id_hdl(struct oid_par_priv *oid)
{
- if (poid_par_priv->type_of_oid != SET_OID)
+ if (oid->type_of_oid != SET_OID)
return RNDIS_STATUS_NOT_ACCEPTED;
return RNDIS_STATUS_SUCCESS;
}
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_rtl.h b/drivers/staging/rtl8712/rtl871x_ioctl_rtl.h
index 3bcceae..fb2aa0c 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_rtl.h
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_rtl.h
@@ -30,92 +30,51 @@
#include "drv_types.h"
/*************** oid_rtl_seg_01_01 **************/
-uint oid_rt_get_signal_quality_hdl(
- struct oid_par_priv *poid_par_priv);/*84*/
-uint oid_rt_get_small_packet_crc_hdl(
- struct oid_par_priv *poid_par_priv);
-uint oid_rt_get_middle_packet_crc_hdl(
- struct oid_par_priv *poid_par_priv);
-uint oid_rt_get_large_packet_crc_hdl(
- struct oid_par_priv *poid_par_priv);
-uint oid_rt_get_tx_retry_hdl(
- struct oid_par_priv *poid_par_priv);
-uint oid_rt_get_rx_retry_hdl(
- struct oid_par_priv *poid_par_priv);
-uint oid_rt_get_rx_total_packet_hdl(
- struct oid_par_priv *poid_par_priv);
-uint oid_rt_get_tx_beacon_ok_hdl(
- struct oid_par_priv *poid_par_priv);
-uint oid_rt_get_tx_beacon_err_hdl(
- struct oid_par_priv *poid_par_priv);
-uint oid_rt_get_rx_icv_err_hdl(
- struct oid_par_priv *poid_par_priv);/*93*/
-uint oid_rt_set_encryption_algorithm_hdl(
- struct oid_par_priv *poid_par_priv);
-uint oid_rt_get_preamble_mode_hdl(
- struct oid_par_priv *poid_par_priv);
-uint oid_rt_get_ap_ip_hdl(
- struct oid_par_priv *poid_par_priv);
-uint oid_rt_get_channelplan_hdl(
- struct oid_par_priv *poid_par_priv);
-uint oid_rt_set_channelplan_hdl(
- struct oid_par_priv *poid_par_priv);
-uint oid_rt_set_preamble_mode_hdl(
- struct oid_par_priv *poid_par_priv);
-uint oid_rt_set_bcn_intvl_hdl(
- struct oid_par_priv *poid_par_priv);
-uint oid_rt_dedicate_probe_hdl(
- struct oid_par_priv *poid_par_priv);
-uint oid_rt_get_total_tx_bytes_hdl(
- struct oid_par_priv *poid_par_priv);
-uint oid_rt_get_total_rx_bytes_hdl(
- struct oid_par_priv *poid_par_priv);
-uint oid_rt_current_tx_power_level_hdl(
- struct oid_par_priv *poid_par_priv);
-uint oid_rt_get_enc_key_mismatch_count_hdl(
- struct oid_par_priv *poid_par_priv);
-uint oid_rt_get_enc_key_match_count_hdl(
- struct oid_par_priv *poid_par_priv);
-uint oid_rt_get_channel_hdl(
- struct oid_par_priv *poid_par_priv);
-uint oid_rt_get_hardware_radio_off_hdl(
- struct oid_par_priv *poid_par_priv);
-uint oid_rt_get_key_mismatch_hdl(
- struct oid_par_priv *poid_par_priv);
-uint oid_rt_supported_wireless_mode_hdl(
- struct oid_par_priv *poid_par_priv);
-uint oid_rt_get_channel_list_hdl(
- struct oid_par_priv *poid_par_priv);
-uint oid_rt_get_scan_in_progress_hdl(
- struct oid_par_priv *poid_par_priv);
-uint oid_rt_forced_data_rate_hdl(
- struct oid_par_priv *poid_par_priv);
-uint oid_rt_wireless_mode_for_scan_list_hdl(
- struct oid_par_priv *poid_par_priv);
-uint oid_rt_get_bss_wireless_mode_hdl(
- struct oid_par_priv *poid_par_priv);
-uint oid_rt_scan_with_magic_packet_hdl(
- struct oid_par_priv *poid_par_priv);
+uint oid_rt_get_signal_quality_hdl(struct oid_par_priv *oid);/*84*/
+uint oid_rt_get_small_packet_crc_hdl(struct oid_par_priv *oid);
+uint oid_rt_get_middle_packet_crc_hdl(struct oid_par_priv *oid);
+uint oid_rt_get_large_packet_crc_hdl(struct oid_par_priv *oid);
+uint oid_rt_get_tx_retry_hdl(struct oid_par_priv *oid);
+uint oid_rt_get_rx_retry_hdl(struct oid_par_priv *oid);
+uint oid_rt_get_rx_total_packet_hdl(struct oid_par_priv *oid);
+uint oid_rt_get_tx_beacon_ok_hdl(struct oid_par_priv *oid);
+uint oid_rt_get_tx_beacon_err_hdl(struct oid_par_priv *oid);
+uint oid_rt_get_rx_icv_err_hdl(struct oid_par_priv *oid);/*93*/
+uint oid_rt_set_encryption_algorithm_hdl(struct oid_par_priv *oid);
+uint oid_rt_get_preamble_mode_hdl(struct oid_par_priv *oid);
+uint oid_rt_get_ap_ip_hdl(struct oid_par_priv *oid);
+uint oid_rt_get_channelplan_hdl(struct oid_par_priv *oid);
+uint oid_rt_set_channelplan_hdl(struct oid_par_priv *oid);
+uint oid_rt_set_preamble_mode_hdl(struct oid_par_priv *oid);
+uint oid_rt_set_bcn_intvl_hdl(struct oid_par_priv *oid);
+uint oid_rt_dedicate_probe_hdl(struct oid_par_priv *oid);
+uint oid_rt_get_total_tx_bytes_hdl(struct oid_par_priv *oid);
+uint oid_rt_get_total_rx_bytes_hdl(struct oid_par_priv *oid);
+uint oid_rt_current_tx_power_level_hdl(struct oid_par_priv *oid);
+uint oid_rt_get_enc_key_mismatch_count_hdl(struct oid_par_priv *oid);
+uint oid_rt_get_enc_key_match_count_hdl(struct oid_par_priv *oid);
+uint oid_rt_get_channel_hdl(struct oid_par_priv *oid);
+uint oid_rt_get_hardware_radio_off_hdl(struct oid_par_priv *oid);
+uint oid_rt_get_key_mismatch_hdl(struct oid_par_priv *oid);
+uint oid_rt_supported_wireless_mode_hdl(struct oid_par_priv *oid);
+uint oid_rt_get_channel_list_hdl(struct oid_par_priv *oid);
+uint oid_rt_get_scan_in_progress_hdl(struct oid_par_priv *oid);
+uint oid_rt_forced_data_rate_hdl(struct oid_par_priv *oid);
+uint oid_rt_wireless_mode_for_scan_list_hdl(struct oid_par_priv *oid);
+uint oid_rt_get_bss_wireless_mode_hdl(struct oid_par_priv *oid);
+uint oid_rt_scan_with_magic_packet_hdl(struct oid_par_priv *oid);
/************** oid_rtl_seg_01_03 section start **************/
-uint oid_rt_ap_get_associated_station_list_hdl(
- struct oid_par_priv *poid_par_priv);
-uint oid_rt_ap_switch_into_ap_mode_hdl(
- struct oid_par_priv *poid_par_priv);
-uint oid_rt_ap_supported_hdl(
- struct oid_par_priv *poid_par_priv);
-uint oid_rt_ap_set_passphrase_hdl(
- struct oid_par_priv *poid_par_priv);
+uint oid_rt_ap_get_associated_station_list_hdl(struct oid_par_priv *oid);
+uint oid_rt_ap_switch_into_ap_mode_hdl(struct oid_par_priv *oid);
+uint oid_rt_ap_supported_hdl(struct oid_par_priv *oid);
+uint oid_rt_ap_set_passphrase_hdl(struct oid_par_priv *oid);
/* oid_rtl_seg_01_11 */
-uint oid_rt_pro_rf_write_registry_hdl(
- struct oid_par_priv *poid_par_priv);
-uint oid_rt_pro_rf_read_registry_hdl(
- struct oid_par_priv *poid_par_priv);
+uint oid_rt_pro_rf_write_registry_hdl(struct oid_par_priv *oid);
+uint oid_rt_pro_rf_read_registry_hdl(struct oid_par_priv *oid);
/*************** oid_rtl_seg_03_00 section start **************/
-uint oid_rt_get_connect_state_hdl(
- struct oid_par_priv *poid_par_priv);
-uint oid_rt_set_default_key_id_hdl(
- struct oid_par_priv *poid_par_priv);
+uint oid_rt_get_connect_state_hdl(struct oid_par_priv *oid);
+uint oid_rt_set_default_key_id_hdl(struct oid_par_priv *oid);
#endif
--
2.6.3
^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH 1/4] staging: rtl8712: Remove casts between void * and type *
2015-11-24 12:19 ` [PATCH 1/4] staging: rtl8712: Remove casts between void * and type * Mauro Dreissig
@ 2015-11-24 13:07 ` Dan Carpenter
2015-11-24 15:18 ` Mauro Dreissig
0 siblings, 1 reply; 11+ messages in thread
From: Dan Carpenter @ 2015-11-24 13:07 UTC (permalink / raw)
To: Mauro Dreissig; +Cc: devel, florian.c.schilhabel, netdev, gregkh, Larry.Finger
On Tue, Nov 24, 2015 at 10:19:39AM -0200, Mauro Dreissig wrote:
> Cleaning rtl871x_ioctl_rtl.c.
>
It's better if you think about the header and the body as two different
things. Just repeat the title but with more information.
regards,
dan carpenter
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 1/4] staging: rtl8712: Remove casts between void * and type *
2015-11-24 13:07 ` Dan Carpenter
@ 2015-11-24 15:18 ` Mauro Dreissig
0 siblings, 0 replies; 11+ messages in thread
From: Mauro Dreissig @ 2015-11-24 15:18 UTC (permalink / raw)
To: Dan Carpenter; +Cc: Larry.Finger, florian.c.schilhabel, gregkh, devel, netdev
On 24-11-2015 11:07, Dan Carpenter wrote:
> On Tue, Nov 24, 2015 at 10:19:39AM -0200, Mauro Dreissig wrote:
>> Cleaning rtl871x_ioctl_rtl.c.
>>
>
> It's better if you think about the header and the body as two different
> things. Just repeat the title but with more information.
>
> regards,
> dan carpenter
>
Will fix that, thanks!
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 3/4] staging: rtl8712: Make error handling check for failure
2015-11-24 12:19 ` [PATCH 3/4] staging: rtl8712: Make error handling check for failure Mauro Dreissig
@ 2015-11-25 11:44 ` Sudip Mukherjee
2015-11-25 14:56 ` Mauro Dreissig
0 siblings, 1 reply; 11+ messages in thread
From: Sudip Mukherjee @ 2015-11-25 11:44 UTC (permalink / raw)
To: Mauro Dreissig; +Cc: Larry.Finger, florian.c.schilhabel, gregkh, devel, netdev
On Tue, Nov 24, 2015 at 10:19:41AM -0200, Mauro Dreissig wrote:
> Some error handling paths are checking for success
> instead of error on rtl871x_ioctl_rtl.c.
>
> Signed-off-by: Mauro Dreissig <mukadr@gmail.com>
> ---
> drivers/staging/rtl8712/rtl871x_ioctl_rtl.c | 239 ++++++++++++++--------------
> 1 file changed, 121 insertions(+), 118 deletions(-)
>
<snip>
> @@ -147,13 +147,13 @@ uint oid_rt_get_rx_icv_err_hdl(struct oid_par_priv *poid_par_priv)
>
> if (poid_par_priv->type_of_oid != QUERY_OID)
> return RNDIS_STATUS_NOT_ACCEPTED;
> - if (poid_par_priv->information_buf_len >= sizeof(u32)) {
> - *(uint *)poid_par_priv->information_buf =
> - adapter->recvpriv.rx_icv_err;
> - *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
> - } else {
> +
> + if (poid_par_priv->information_buf_len < sizeof(u32))
trailing whitespace here.
Please always test your patch with checkpatch.
regards
sudip
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 3/4] staging: rtl8712: Make error handling check for failure
2015-11-25 11:44 ` Sudip Mukherjee
@ 2015-11-25 14:56 ` Mauro Dreissig
2015-11-25 15:04 ` Mauro Dreissig
0 siblings, 1 reply; 11+ messages in thread
From: Mauro Dreissig @ 2015-11-25 14:56 UTC (permalink / raw)
To: Sudip Mukherjee; +Cc: Larry.Finger, florian.c.schilhabel, gregkh, devel, netdev
On 25-11-2015 09:44, Sudip Mukherjee wrote:
> On Tue, Nov 24, 2015 at 10:19:41AM -0200, Mauro Dreissig wrote:
>> Some error handling paths are checking for success
>> instead of error on rtl871x_ioctl_rtl.c.
>>
>> Signed-off-by: Mauro Dreissig <mukadr@gmail.com>
>> ---
>> drivers/staging/rtl8712/rtl871x_ioctl_rtl.c | 239 ++++++++++++++--------------
>> 1 file changed, 121 insertions(+), 118 deletions(-)
>>
> <snip>
>> @@ -147,13 +147,13 @@ uint oid_rt_get_rx_icv_err_hdl(struct oid_par_priv *poid_par_priv)
>>
>> if (poid_par_priv->type_of_oid != QUERY_OID)
>> return RNDIS_STATUS_NOT_ACCEPTED;
>> - if (poid_par_priv->information_buf_len >= sizeof(u32)) {
>> - *(uint *)poid_par_priv->information_buf =
>> - adapter->recvpriv.rx_icv_err;
>> - *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
>> - } else {
>> +
>> + if (poid_par_priv->information_buf_len < sizeof(u32))
>
> trailing whitespace here.
> Please always test your patch with checkpatch.
>
> regards
> sudip
>
This blank line is intentional, there is no trailing whitespace.
thanks,
Mauro
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 3/4] staging: rtl8712: Make error handling check for failure
2015-11-25 14:56 ` Mauro Dreissig
@ 2015-11-25 15:04 ` Mauro Dreissig
2016-02-08 3:48 ` Greg KH
0 siblings, 1 reply; 11+ messages in thread
From: Mauro Dreissig @ 2015-11-25 15:04 UTC (permalink / raw)
To: Sudip Mukherjee; +Cc: Larry.Finger, florian.c.schilhabel, gregkh, devel, netdev
On 25-11-2015 12:56, Mauro Dreissig wrote:
> On 25-11-2015 09:44, Sudip Mukherjee wrote:
>> On Tue, Nov 24, 2015 at 10:19:41AM -0200, Mauro Dreissig wrote:
>>> Some error handling paths are checking for success
>>> instead of error on rtl871x_ioctl_rtl.c.
>>>
>>> Signed-off-by: Mauro Dreissig <mukadr@gmail.com>
>>> ---
>>> drivers/staging/rtl8712/rtl871x_ioctl_rtl.c | 239 ++++++++++++++--------------
>>> 1 file changed, 121 insertions(+), 118 deletions(-)
>>>
>> <snip>
>>> @@ -147,13 +147,13 @@ uint oid_rt_get_rx_icv_err_hdl(struct oid_par_priv *poid_par_priv)
>>>
>>> if (poid_par_priv->type_of_oid != QUERY_OID)
>>> return RNDIS_STATUS_NOT_ACCEPTED;
>>> - if (poid_par_priv->information_buf_len >= sizeof(u32)) {
>>> - *(uint *)poid_par_priv->information_buf =
>>> - adapter->recvpriv.rx_icv_err;
>>> - *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
>>> - } else {
>>> +
>>> + if (poid_par_priv->information_buf_len < sizeof(u32))
>>
>> trailing whitespace here.
>> Please always test your patch with checkpatch.
>>
>> regards
>> sudip
>>
> This blank line is intentional, there is no trailing whitespace.
>
> thanks,
> Mauro
>
My mistake, seems like I fixed it in the other patch in the series.
thanks,
Mauro
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 3/4] staging: rtl8712: Make error handling check for failure
2015-11-25 15:04 ` Mauro Dreissig
@ 2016-02-08 3:48 ` Greg KH
0 siblings, 0 replies; 11+ messages in thread
From: Greg KH @ 2016-02-08 3:48 UTC (permalink / raw)
To: Mauro Dreissig
Cc: Sudip Mukherjee, Larry.Finger, florian.c.schilhabel, devel, netdev
On Wed, Nov 25, 2015 at 01:04:14PM -0200, Mauro Dreissig wrote:
> On 25-11-2015 12:56, Mauro Dreissig wrote:
> > On 25-11-2015 09:44, Sudip Mukherjee wrote:
> >> On Tue, Nov 24, 2015 at 10:19:41AM -0200, Mauro Dreissig wrote:
> >>> Some error handling paths are checking for success
> >>> instead of error on rtl871x_ioctl_rtl.c.
> >>>
> >>> Signed-off-by: Mauro Dreissig <mukadr@gmail.com>
> >>> ---
> >>> drivers/staging/rtl8712/rtl871x_ioctl_rtl.c | 239 ++++++++++++++--------------
> >>> 1 file changed, 121 insertions(+), 118 deletions(-)
> >>>
> >> <snip>
> >>> @@ -147,13 +147,13 @@ uint oid_rt_get_rx_icv_err_hdl(struct oid_par_priv *poid_par_priv)
> >>>
> >>> if (poid_par_priv->type_of_oid != QUERY_OID)
> >>> return RNDIS_STATUS_NOT_ACCEPTED;
> >>> - if (poid_par_priv->information_buf_len >= sizeof(u32)) {
> >>> - *(uint *)poid_par_priv->information_buf =
> >>> - adapter->recvpriv.rx_icv_err;
> >>> - *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
> >>> - } else {
> >>> +
> >>> + if (poid_par_priv->information_buf_len < sizeof(u32))
> >>
> >> trailing whitespace here.
> >> Please always test your patch with checkpatch.
> >>
> >> regards
> >> sudip
> >>
> > This blank line is intentional, there is no trailing whitespace.
> >
> > thanks,
> > Mauro
> >
> My mistake, seems like I fixed it in the other patch in the series.
Which isn't ok, please fix up the series and resend.
thanks,
greg k-h
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2016-02-08 3:48 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-11-24 12:19 [PATCH 0/4] staging: rtl8712: Cleanups for rtl871x_ioctl_rtl Mauro Dreissig
2015-11-24 12:19 ` [PATCH 1/4] staging: rtl8712: Remove casts between void * and type * Mauro Dreissig
2015-11-24 13:07 ` Dan Carpenter
2015-11-24 15:18 ` Mauro Dreissig
2015-11-24 12:19 ` [PATCH 2/4] staging: rtl8712: Rename local variable Mauro Dreissig
2015-11-24 12:19 ` [PATCH 3/4] staging: rtl8712: Make error handling check for failure Mauro Dreissig
2015-11-25 11:44 ` Sudip Mukherjee
2015-11-25 14:56 ` Mauro Dreissig
2015-11-25 15:04 ` Mauro Dreissig
2016-02-08 3:48 ` Greg KH
2015-11-24 12:19 ` [PATCH 4/4] staging: rtl8712: Rename local variable Mauro Dreissig
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.