Commit 6da2422e authored by Nishka Dasgupta's avatar Nishka Dasgupta Committed by Greg Kroah-Hartman

staging: rtl8712: xmitframe_addmic(): Change return values and type

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: default avatarNishka Dasgupta <nishkadg.linux@gmail.com>
Link: https://lore.kernel.org/r/20190813044638.16348-1-nishkadg.linux@gmail.comSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 737d4d9e
...@@ -342,8 +342,8 @@ int r8712_update_attrib(struct _adapter *padapter, _pkt *pkt, ...@@ -342,8 +342,8 @@ int r8712_update_attrib(struct _adapter *padapter, _pkt *pkt,
return 0; return 0;
} }
static sint xmitframe_addmic(struct _adapter *padapter, static int xmitframe_addmic(struct _adapter *padapter,
struct xmit_frame *pxmitframe) struct xmit_frame *pxmitframe)
{ {
u32 curfragnum, length; u32 curfragnum, length;
u8 *pframe, *payload, mic[8]; u8 *pframe, *payload, mic[8];
...@@ -372,7 +372,7 @@ static sint xmitframe_addmic(struct _adapter *padapter, ...@@ -372,7 +372,7 @@ static sint xmitframe_addmic(struct _adapter *padapter,
if (!memcmp(psecuritypriv->XGrptxmickey if (!memcmp(psecuritypriv->XGrptxmickey
[psecuritypriv->XGrpKeyid].skey, [psecuritypriv->XGrpKeyid].skey,
null_key, 16)) null_key, 16))
return _FAIL; return -ENOMEM;
/*start to calculate the mic code*/ /*start to calculate the mic code*/
r8712_secmicsetkey(&micdata, r8712_secmicsetkey(&micdata,
psecuritypriv-> psecuritypriv->
...@@ -381,7 +381,7 @@ static sint xmitframe_addmic(struct _adapter *padapter, ...@@ -381,7 +381,7 @@ static sint xmitframe_addmic(struct _adapter *padapter,
} else { } else {
if (!memcmp(&stainfo->tkiptxmickey.skey[0], if (!memcmp(&stainfo->tkiptxmickey.skey[0],
null_key, 16)) null_key, 16))
return _FAIL; return -ENOMEM;
/* start to calculate the mic code */ /* start to calculate the mic code */
r8712_secmicsetkey(&micdata, r8712_secmicsetkey(&micdata,
&stainfo->tkiptxmickey.skey[0]); &stainfo->tkiptxmickey.skey[0]);
...@@ -442,7 +442,7 @@ static sint xmitframe_addmic(struct _adapter *padapter, ...@@ -442,7 +442,7 @@ static sint xmitframe_addmic(struct _adapter *padapter,
payload = payload - pattrib->last_txcmdsz + 8; payload = payload - pattrib->last_txcmdsz + 8;
} }
} }
return _SUCCESS; return 0;
} }
static sint xmitframe_swencrypt(struct _adapter *padapter, static sint xmitframe_swencrypt(struct _adapter *padapter,
...@@ -696,7 +696,7 @@ sint r8712_xmitframe_coalesce(struct _adapter *padapter, _pkt *pkt, ...@@ -696,7 +696,7 @@ sint r8712_xmitframe_coalesce(struct _adapter *padapter, _pkt *pkt,
memcpy(mem_start, pbuf_start + TXDESC_OFFSET, pattrib->hdrlen); memcpy(mem_start, pbuf_start + TXDESC_OFFSET, pattrib->hdrlen);
} }
if (xmitframe_addmic(padapter, pxmitframe) == _FAIL) if (xmitframe_addmic(padapter, pxmitframe))
return _FAIL; return _FAIL;
xmitframe_swencrypt(padapter, pxmitframe); xmitframe_swencrypt(padapter, pxmitframe);
return _SUCCESS; return _SUCCESS;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment