Commit 3f411e8c authored by Nishka Dasgupta's avatar Nishka Dasgupta Committed by Greg Kroah-Hartman
Browse files

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



Change return values of r8712_xmit_classifier from _SUCCESS and _FAIL to
0 and -EINVAL respectively.
Modify call site to check for non-zero return values instead of _FAIL.
Change return type from sint to int.

Signed-off-by: default avatarNishka Dasgupta <nishkadg.linux@gmail.com>
Reviewed-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Link: https://lore.kernel.org/r/20190808064012.12661-10-nishkadg.linux@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1c8a4f7c

drivers/staging/rtl8712/rtl8712_xmit.c

+1 −1
Original line number Diff line number Diff line
@@ -750,7 +750,7 @@ int r8712_xmit_direct(struct _adapter *padapter, struct xmit_frame *pxmitframe) 


int r8712_xmit_enqueue(struct _adapter *padapter, struct xmit_frame *pxmitframe)

{

	if (r8712_xmit_classifier(padapter, pxmitframe) == _FAIL) {

	if (r8712_xmit_classifier(padapter, pxmitframe)) {

		pxmitframe->pkt = NULL;

		return _FAIL;

	}

drivers/staging/rtl8712/rtl871x_xmit.c

+4 −4
Original line number Diff line number Diff line
@@ -894,7 +894,7 @@ static inline struct tx_servq *get_sta_pending(struct _adapter *padapter, 
 * Will enqueue pxmitframe to the proper queue, and indicate it

 * to xx_pending list.....

 */

sint r8712_xmit_classifier(struct _adapter *padapter,

int r8712_xmit_classifier(struct _adapter *padapter,

			  struct xmit_frame *pxmitframe)

{

	unsigned long irqL0;
@@ -920,7 +920,7 @@ sint r8712_xmit_classifier(struct _adapter *padapter, 
		}

	}

	if (psta == NULL)

		return _FAIL;

		return -EINVAL;

	ptxservq = get_sta_pending(padapter, &pstapending,

		   psta, pattrib->priority);

	spin_lock_irqsave(&pstapending->lock, irqL0);
@@ -929,7 +929,7 @@ sint r8712_xmit_classifier(struct _adapter *padapter, 
	list_add_tail(&pxmitframe->list, &ptxservq->sta_pending.queue);

	ptxservq->qcnt++;

	spin_unlock_irqrestore(&pstapending->lock, irqL0);

	return _SUCCESS;

	return 0;

}



static void alloc_hwxmits(struct _adapter *padapter)

drivers/staging/rtl8712/rtl871x_xmit.h

+2 −2
Original line number Diff line number Diff line
@@ -258,7 +258,7 @@ void r8712_free_xmitframe(struct xmit_priv *pxmitpriv, 
			  struct xmit_frame *pxmitframe);

void r8712_free_xmitframe_queue(struct xmit_priv *pxmitpriv,

				struct  __queue *pframequeue);

sint r8712_xmit_classifier(struct _adapter *padapter,

int r8712_xmit_classifier(struct _adapter *padapter,

			  struct xmit_frame *pxmitframe);

sint r8712_xmitframe_coalesce(struct _adapter *padapter, _pkt *pkt,

			      struct xmit_frame *pxmitframe);

CRA Git | Maintained and supported by SUSTech CRA and CCSE