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

staging: r8188eu: simplify rtw_get_ff_hwaddr 



On both occassions where rtw_get_ff_hwaddr is called, the result is used
as addr parameter for rtw_write_port. rtw_write_port only needs the info
if the high queue was used or not. Simplify rtw_get_ff_hwaddr accordingly
and remove the now unused queue defines.

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/20230207192319.294203-7-martin@kaiser.cx


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

drivers/staging/r8188eu/core/rtw_xmit.c

+1 −31
Original line number Diff line number Diff line
@@ -1568,39 +1568,9 @@ static int rtw_br_client_tx(struct adapter *padapter, struct sk_buff **pskb) 


u32 rtw_get_ff_hwaddr(struct xmit_frame *pxmitframe)

{

	u32 addr;

	struct pkt_attrib *pattrib = &pxmitframe->attrib;



	switch (pattrib->qsel) {

	case 0:

	case 3:

		addr = BE_QUEUE_INX;

		break;

	case 1:

	case 2:

		addr = BK_QUEUE_INX;

		break;

	case 4:

	case 5:

		addr = VI_QUEUE_INX;

		break;

	case 6:

	case 7:

		addr = VO_QUEUE_INX;

		break;

	case 0x10:

		addr = BCN_QUEUE_INX;

		break;

	case 0x11:/* BC/MC in PS (HIQ) */

		addr = HIGH_QUEUE_INX;

		break;

	case 0x12:

	default:

		addr = MGT_QUEUE_INX;

		break;

	}



	return addr;

	return pattrib->qsel == 0x11 ? HIGH_QUEUE_INX : 0;

}



/*

drivers/staging/r8188eu/include/rtw_xmit.h

+0 −7
Original line number Diff line number Diff line
@@ -26,14 +26,7 @@ 
#define XMIT_BE_QUEUE		(2)

#define XMIT_BK_QUEUE		(3)



#define VO_QUEUE_INX		0

#define VI_QUEUE_INX		1

#define BE_QUEUE_INX		2

#define BK_QUEUE_INX		3

#define BCN_QUEUE_INX		4

#define MGT_QUEUE_INX		5

#define HIGH_QUEUE_INX		6

#define TXCMD_QUEUE_INX		7



#define HW_QUEUE_ENTRY		8