* [PATCH RESEND 1/4] staging: rtl8712: xmitframe_addmic(): Change return values and type
@ 2019-08-13 4:46 Nishka Dasgupta
2019-08-13 4:46 ` [PATCH RESEND 2/4] staging: rtl8712: r8712_append_mpdu_unit(): Change return type Nishka Dasgupta
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Nishka Dasgupta @ 2019-08-13 4:46 UTC (permalink / raw)
Change return values of xmitframe_addmic from _SUCCESS and _FAIL to 0
and -ENOMEM respectively. Modify call sites to check for non-zero values
instead of _FAIL.
Also change return type from sint to int.
Signed-off-by: Nishka Dasgupta <nishkadg.linux at gmail.com>
---
drivers/staging/rtl8712/rtl871x_xmit.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/rtl8712/rtl871x_xmit.c b/drivers/staging/rtl8712/rtl871x_xmit.c
index 178f8b96943b..cc5809e49e35 100644
--- a/drivers/staging/rtl8712/rtl871x_xmit.c
+++ b/drivers/staging/rtl8712/rtl871x_xmit.c
@@ -342,8 +342,8 @@ int r8712_update_attrib(struct _adapter *padapter, _pkt *pkt,
return 0;
}
-static sint xmitframe_addmic(struct _adapter *padapter,
- struct xmit_frame *pxmitframe)
+static int xmitframe_addmic(struct _adapter *padapter,
+ struct xmit_frame *pxmitframe)
{
u32 curfragnum, length;
u8 *pframe, *payload, mic[8];
@@ -372,7 +372,7 @@ static sint xmitframe_addmic(struct _adapter *padapter,
if (!memcmp(psecuritypriv->XGrptxmickey
[psecuritypriv->XGrpKeyid].skey,
null_key, 16))
- return _FAIL;
+ return -ENOMEM;
/*start to calculate the mic code*/
r8712_secmicsetkey(&micdata,
psecuritypriv->
@@ -381,7 +381,7 @@ static sint xmitframe_addmic(struct _adapter *padapter,
} else {
if (!memcmp(&stainfo->tkiptxmickey.skey[0],
null_key, 16))
- return _FAIL;
+ return -ENOMEM;
/* start to calculate the mic code */
r8712_secmicsetkey(&micdata,
&stainfo->tkiptxmickey.skey[0]);
@@ -442,7 +442,7 @@ static sint xmitframe_addmic(struct _adapter *padapter,
payload = payload - pattrib->last_txcmdsz + 8;
}
}
- return _SUCCESS;
+ return 0;
}
static sint xmitframe_swencrypt(struct _adapter *padapter,
@@ -696,7 +696,7 @@ sint r8712_xmitframe_coalesce(struct _adapter *padapter, _pkt *pkt,
memcpy(mem_start, pbuf_start + TXDESC_OFFSET, pattrib->hdrlen);
}
- if (xmitframe_addmic(padapter, pxmitframe) == _FAIL)
+ if (xmitframe_addmic(padapter, pxmitframe))
return _FAIL;
xmitframe_swencrypt(padapter, pxmitframe);
return _SUCCESS;
--
2.19.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH RESEND 2/4] staging: rtl8712: r8712_append_mpdu_unit(): Change return type
2019-08-13 4:46 [PATCH RESEND 1/4] staging: rtl8712: xmitframe_addmic(): Change return values and type Nishka Dasgupta
@ 2019-08-13 4:46 ` Nishka Dasgupta
2019-08-13 4:46 ` [PATCH RESEND 3/4] staging: rtl8712: r8712_xmitframe_aggr_1st(): Change return type to void Nishka Dasgupta
2019-08-13 4:46 ` [PATCH RESEND 4/4] staging: rtl8712: r8712_dump_aggr_xframe(): Change " Nishka Dasgupta
2 siblings, 0 replies; 4+ messages in thread
From: Nishka Dasgupta @ 2019-08-13 4:46 UTC (permalink / raw)
Change return type of r8712_append_mpdu_unit from u8 to void and remove
its return statement as it always returns only _SUCCESS. Modify call
sites to simply call this function instead of checking its return value,
and execute all the statements in the if-block for when the function
returns _SUCCESS.
Signed-off-by: Nishka Dasgupta <nishkadg.linux at gmail.com>
---
drivers/staging/rtl8712/rtl8712_xmit.c | 19 ++++++++-----------
1 file changed, 8 insertions(+), 11 deletions(-)
diff --git a/drivers/staging/rtl8712/rtl8712_xmit.c b/drivers/staging/rtl8712/rtl8712_xmit.c
index 04e70048f0dd..6f1dbcf25859 100644
--- a/drivers/staging/rtl8712/rtl8712_xmit.c
+++ b/drivers/staging/rtl8712/rtl8712_xmit.c
@@ -278,8 +278,8 @@ void r8712_construct_txaggr_cmd_hdr(struct xmit_buf *pxmitbuf)
pcmdpriv->cmd_seq++;
}
-u8 r8712_append_mpdu_unit(struct xmit_buf *pxmitbuf,
- struct xmit_frame *pxmitframe)
+void r8712_append_mpdu_unit(struct xmit_buf *pxmitbuf,
+ struct xmit_frame *pxmitframe)
{
struct _adapter *padapter = pxmitframe->padapter;
struct tx_desc *ptx_desc = (struct tx_desc *)pxmitbuf->pbuf;
@@ -315,8 +315,6 @@ u8 r8712_append_mpdu_unit(struct xmit_buf *pxmitbuf,
((ptx_desc->txdw0 & 0x0000ffff) +
((TXDESC_SIZE + last_txcmdsz + padding_sz) &
0x0000ffff)));
-
- return _SUCCESS;
}
@@ -332,8 +330,8 @@ u8 r8712_xmitframe_aggr_1st(struct xmit_buf *pxmitbuf,
/*RTL8712_DMA_H2CCMD */
r8712_construct_txaggr_cmd_desc(pxmitbuf);
r8712_construct_txaggr_cmd_hdr(pxmitbuf);
- if (r8712_append_mpdu_unit(pxmitbuf, pxmitframe) == _SUCCESS)
- pxmitbuf->aggr_nr = 1;
+ r8712_append_mpdu_unit(pxmitbuf, pxmitframe);
+ pxmitbuf->aggr_nr = 1;
return _SUCCESS;
}
@@ -347,11 +345,10 @@ u16 r8712_xmitframe_aggr_next(struct xmit_buf *pxmitbuf,
/* buffer addr assoc */
pxmitframe->buf_addr = pxmitbuf->pbuf + TXDESC_SIZE +
(((struct tx_desc *)pxmitbuf->pbuf)->txdw0 & 0x0000ffff);
- if (r8712_append_mpdu_unit(pxmitbuf, pxmitframe) == _SUCCESS) {
- r8712_free_xmitframe_ex(&pxmitframe->padapter->xmitpriv,
- pxmitframe);
- pxmitbuf->aggr_nr++;
- }
+ r8712_append_mpdu_unit(pxmitbuf, pxmitframe);
+ r8712_free_xmitframe_ex(&pxmitframe->padapter->xmitpriv,
+ pxmitframe);
+ pxmitbuf->aggr_nr++;
return TXDESC_SIZE +
(((struct tx_desc *)pxmitbuf->pbuf)->txdw0 & 0x0000ffff);
--
2.19.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH RESEND 3/4] staging: rtl8712: r8712_xmitframe_aggr_1st(): Change return type to void
2019-08-13 4:46 [PATCH RESEND 1/4] staging: rtl8712: xmitframe_addmic(): Change return values and type Nishka Dasgupta
2019-08-13 4:46 ` [PATCH RESEND 2/4] staging: rtl8712: r8712_append_mpdu_unit(): Change return type Nishka Dasgupta
@ 2019-08-13 4:46 ` Nishka Dasgupta
2019-08-13 4:46 ` [PATCH RESEND 4/4] staging: rtl8712: r8712_dump_aggr_xframe(): Change " Nishka Dasgupta
2 siblings, 0 replies; 4+ messages in thread
From: Nishka Dasgupta @ 2019-08-13 4:46 UTC (permalink / raw)
Change return type of r8712_xmitframe_aggr_1st from u8 to void as it
always returns _SUCCESS and its return value is never used.
Signed-off-by: Nishka Dasgupta <nishkadg.linux at gmail.com>
---
drivers/staging/rtl8712/rtl8712_xmit.c | 6 ++----
drivers/staging/rtl8712/rtl8712_xmit.h | 4 ++--
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/rtl8712/rtl8712_xmit.c b/drivers/staging/rtl8712/rtl8712_xmit.c
index 6f1dbcf25859..9152c25c11f8 100644
--- a/drivers/staging/rtl8712/rtl8712_xmit.c
+++ b/drivers/staging/rtl8712/rtl8712_xmit.c
@@ -318,8 +318,8 @@ void r8712_append_mpdu_unit(struct xmit_buf *pxmitbuf,
}
-u8 r8712_xmitframe_aggr_1st(struct xmit_buf *pxmitbuf,
- struct xmit_frame *pxmitframe)
+void r8712_xmitframe_aggr_1st(struct xmit_buf *pxmitbuf,
+ struct xmit_frame *pxmitframe)
{
/* linux complete context doesn't need to protect */
pxmitframe->pxmitbuf = pxmitbuf;
@@ -332,8 +332,6 @@ u8 r8712_xmitframe_aggr_1st(struct xmit_buf *pxmitbuf,
r8712_construct_txaggr_cmd_hdr(pxmitbuf);
r8712_append_mpdu_unit(pxmitbuf, pxmitframe);
pxmitbuf->aggr_nr = 1;
-
- return _SUCCESS;
}
u16 r8712_xmitframe_aggr_next(struct xmit_buf *pxmitbuf,
diff --git a/drivers/staging/rtl8712/rtl8712_xmit.h b/drivers/staging/rtl8712/rtl8712_xmit.h
index 9be8fb70c92e..faf2128285b6 100644
--- a/drivers/staging/rtl8712/rtl8712_xmit.h
+++ b/drivers/staging/rtl8712/rtl8712_xmit.h
@@ -102,8 +102,8 @@ void r8712_do_queue_select(struct _adapter *padapter,
struct pkt_attrib *pattrib);
#ifdef CONFIG_R8712_TX_AGGR
-u8 r8712_xmitframe_aggr_1st(struct xmit_buf *pxmitbuf,
- struct xmit_frame *pxmitframe);
+void r8712_xmitframe_aggr_1st(struct xmit_buf *pxmitbuf,
+ struct xmit_frame *pxmitframe);
u8 r8712_dump_aggr_xframe(struct xmit_buf *pxmitbuf,
struct xmit_frame *pxmitframe);
#endif
--
2.19.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH RESEND 4/4] staging: rtl8712: r8712_dump_aggr_xframe(): Change type to void
2019-08-13 4:46 [PATCH RESEND 1/4] staging: rtl8712: xmitframe_addmic(): Change return values and type Nishka Dasgupta
2019-08-13 4:46 ` [PATCH RESEND 2/4] staging: rtl8712: r8712_append_mpdu_unit(): Change return type Nishka Dasgupta
2019-08-13 4:46 ` [PATCH RESEND 3/4] staging: rtl8712: r8712_xmitframe_aggr_1st(): Change return type to void Nishka Dasgupta
@ 2019-08-13 4:46 ` Nishka Dasgupta
2 siblings, 0 replies; 4+ messages in thread
From: Nishka Dasgupta @ 2019-08-13 4:46 UTC (permalink / raw)
Change return type of r8712_dump_aggr_xframe from u8 to void as it
always returns _SUCCESS and its return value is never used.
Signed-off-by: Nishka Dasgupta <nishkadg.linux at gmail.com>
---
drivers/staging/rtl8712/rtl8712_xmit.c | 6 ++----
drivers/staging/rtl8712/rtl8712_xmit.h | 4 ++--
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/rtl8712/rtl8712_xmit.c b/drivers/staging/rtl8712/rtl8712_xmit.c
index 9152c25c11f8..c247f92207f5 100644
--- a/drivers/staging/rtl8712/rtl8712_xmit.c
+++ b/drivers/staging/rtl8712/rtl8712_xmit.c
@@ -352,8 +352,8 @@ u16 r8712_xmitframe_aggr_next(struct xmit_buf *pxmitbuf,
(((struct tx_desc *)pxmitbuf->pbuf)->txdw0 & 0x0000ffff);
}
-u8 r8712_dump_aggr_xframe(struct xmit_buf *pxmitbuf,
- struct xmit_frame *pxmitframe)
+void r8712_dump_aggr_xframe(struct xmit_buf *pxmitbuf,
+ struct xmit_frame *pxmitframe)
{
struct _adapter *padapter = pxmitframe->padapter;
struct dvobj_priv *pdvobj = &padapter->dvobjpriv;
@@ -390,8 +390,6 @@ u8 r8712_dump_aggr_xframe(struct xmit_buf *pxmitbuf,
}
r8712_write_port(pxmitframe->padapter, RTL8712_DMA_H2CCMD,
total_length + TXDESC_SIZE, (u8 *)pxmitframe);
-
- return _SUCCESS;
}
#endif
diff --git a/drivers/staging/rtl8712/rtl8712_xmit.h b/drivers/staging/rtl8712/rtl8712_xmit.h
index faf2128285b6..0b56bd3ac4d0 100644
--- a/drivers/staging/rtl8712/rtl8712_xmit.h
+++ b/drivers/staging/rtl8712/rtl8712_xmit.h
@@ -104,8 +104,8 @@ void r8712_do_queue_select(struct _adapter *padapter,
#ifdef CONFIG_R8712_TX_AGGR
void r8712_xmitframe_aggr_1st(struct xmit_buf *pxmitbuf,
struct xmit_frame *pxmitframe);
-u8 r8712_dump_aggr_xframe(struct xmit_buf *pxmitbuf,
- struct xmit_frame *pxmitframe);
+void r8712_dump_aggr_xframe(struct xmit_buf *pxmitbuf,
+ struct xmit_frame *pxmitframe);
#endif
#endif
--
2.19.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-08-13 4:46 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-08-13 4:46 [PATCH RESEND 1/4] staging: rtl8712: xmitframe_addmic(): Change return values and type Nishka Dasgupta
2019-08-13 4:46 ` [PATCH RESEND 2/4] staging: rtl8712: r8712_append_mpdu_unit(): Change return type Nishka Dasgupta
2019-08-13 4:46 ` [PATCH RESEND 3/4] staging: rtl8712: r8712_xmitframe_aggr_1st(): Change return type to void Nishka Dasgupta
2019-08-13 4:46 ` [PATCH RESEND 4/4] staging: rtl8712: r8712_dump_aggr_xframe(): Change " Nishka Dasgupta
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).