Commit a6b25e29 authored by Martin Kaiser's avatar Martin Kaiser Committed by Greg Kroah-Hartman
Browse files

staging: r8188eu: simplify rtw_make_wlanhdr's error handling 



Simplify the error handling in rtw_make_wlanhdr. Exit immediately instead
of jumping to the end of the function. We don't have to do any clean-up.

Signed-off-by: default avatarMartin Kaiser <martin@kaiser.cx>
Tested-by: Philipp Hortmann <philipp.g.hortmann@gmail.com> # Edimax N150
Link: https://lore.kernel.org/r/20221230180646.91008-11-martin@kaiser.cx


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

drivers/staging/r8188eu/core/rtw_xmit.c

+2 −6
Original line number Diff line number Diff line
@@ -792,8 +792,6 @@ s32 rtw_make_wlanhdr(struct adapter *padapter, u8 *hdr, struct pkt_attrib *pattr 
	struct mlme_priv *pmlmepriv = &padapter->mlmepriv;

	struct qos_priv *pqospriv = &pmlmepriv->qospriv;

	u8 qos_option = false;



	int res = _SUCCESS;

	__le16 *fctrl = &pwlanhdr->frame_control;



	struct sta_info *psta;
@@ -840,8 +838,7 @@ s32 rtw_make_wlanhdr(struct adapter *padapter, u8 *hdr, struct pkt_attrib *pattr 
		if (psta->qos_option)

			qos_option = true;

	} else {

		res = _FAIL;

		goto exit;

		return _FAIL;

	}



	if (pattrib->mdata)
@@ -897,9 +894,8 @@ s32 rtw_make_wlanhdr(struct adapter *padapter, u8 *hdr, struct pkt_attrib *pattr 
			}

		}

	}

exit:



	return res;

	return _SUCCESS;

}



s32 rtw_txframes_pending(struct adapter *padapter)