patch "staging: rtl8192e: GetTs Fix invalid TID 7 warning." added to staging-linus

PATCH [email protected] 1 participant 1 message May 15, 2017

Subsystems (2)

Stable branch Staging

lore

Share & tools

lore

[email protected]

author maintainer Applied

2017-05-15 09:50 UTC #0 lore raw

This is a note to let you know that I've just added the patch titled

staging: rtl8192e: GetTs Fix invalid TID 7 warning.

to my staging git tree which can be found at
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git
in the staging-linus branch.

The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.)

The patch will hopefully also be merged in Linus's tree for the next -rc kernel release.

If you have any questions about this process, please let me know.

Quoted 1 line

From 95d93e271d920dfda369d4740b1cc1061d41fe7f Mon Sep 17 00:00:00 2001

From: Malcolm Priestley <[email protected]>
Date: Thu, 11 May 2017 18:57:46 +0100
Subject: 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 Malcolm Priestley <[email protected]>

Cc <[email protected]>

Signed-off-by Greg Kroah-Hartman <[email protected]>

---
 drivers/staging/rtl8192e/rtl819x_TSProc.c | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

drivers/staging/rtl8192e/rtl819x_TSProc.c +4 ~~-11~~

index 48bbd9e8a52f..dcc4eb691889 100644
@@ -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;
 		}
 	}

Signature · 1 line

2.13.0