Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 95d93e27 authored by Malcolm Priestley's avatar Malcolm Priestley Committed by Greg Kroah-Hartman
Browse files

staging: rtl8192e: GetTs Fix invalid TID 7 warning. 



TID 7 is a valid value for QoS IEEE 802.11e.

The switch statement that follows states 7 is valid.

Remove function IsACValid and use the default case to filter
invalid TIDs.

Signed-off-by: default avatarMalcolm Priestley <tvboxspy@gmail.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 90be652c

drivers/staging/rtl8192e/rtl819x_TSProc.c

+4 −11
Original line number Diff line number Diff line
@@ -306,11 +306,6 @@ static void MakeTSEntry(struct ts_common_info *pTsCommonInfo, u8 *Addr, 
	pTsCommonInfo->TClasNum = TCLAS_Num;

}



static bool IsACValid(unsigned int tid)

{

	return tid < 7;

}



bool GetTs(struct rtllib_device *ieee, struct ts_common_info **ppTS,

	   u8 *Addr, u8 TID, enum tr_select TxRxSelect, bool bAddNewTs)

{
@@ -328,12 +323,6 @@ bool GetTs(struct rtllib_device *ieee, struct ts_common_info **ppTS, 
	if (ieee->current_network.qos_data.supported == 0) {

		UP = 0;

	} else {

		if (!IsACValid(TID)) {

			netdev_warn(ieee->dev, "%s(): TID(%d) is not valid\n",

				    __func__, TID);

			return false;

		}



		switch (TID) {

		case 0:

		case 3:
@@ -351,6 +340,10 @@ bool GetTs(struct rtllib_device *ieee, struct ts_common_info **ppTS, 
		case 7:

			UP = 7;

			break;

		default:

			netdev_warn(ieee->dev, "%s(): TID(%d) is not valid\n",

				    __func__, TID);

			return false;

		}

	}