diff options
author | Malcolm Priestley <tvboxspy@gmail.com> | 2017-05-11 13:57:46 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-05-15 05:48:45 -0400 |
commit | 95d93e271d920dfda369d4740b1cc1061d41fe7f (patch) | |
tree | 8ded24ca02b9636b9e48ba3a048c9a9367386192 | |
parent | 90be652c9f157d44b9c2803f902a8839796c090d (diff) |
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 <tvboxspy@gmail.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/staging/rtl8192e/rtl819x_TSProc.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/drivers/staging/rtl8192e/rtl819x_TSProc.c b/drivers/staging/rtl8192e/rtl819x_TSProc.c index 48bbd9e8a52f..dcc4eb691889 100644 --- a/drivers/staging/rtl8192e/rtl819x_TSProc.c +++ b/drivers/staging/rtl8192e/rtl819x_TSProc.c | |||
@@ -306,11 +306,6 @@ static void MakeTSEntry(struct ts_common_info *pTsCommonInfo, u8 *Addr, | |||
306 | pTsCommonInfo->TClasNum = TCLAS_Num; | 306 | pTsCommonInfo->TClasNum = TCLAS_Num; |
307 | } | 307 | } |
308 | 308 | ||
309 | static bool IsACValid(unsigned int tid) | ||
310 | { | ||
311 | return tid < 7; | ||
312 | } | ||
313 | |||
314 | bool GetTs(struct rtllib_device *ieee, struct ts_common_info **ppTS, | 309 | bool GetTs(struct rtllib_device *ieee, struct ts_common_info **ppTS, |
315 | u8 *Addr, u8 TID, enum tr_select TxRxSelect, bool bAddNewTs) | 310 | u8 *Addr, u8 TID, enum tr_select TxRxSelect, bool bAddNewTs) |
316 | { | 311 | { |
@@ -328,12 +323,6 @@ bool GetTs(struct rtllib_device *ieee, struct ts_common_info **ppTS, | |||
328 | if (ieee->current_network.qos_data.supported == 0) { | 323 | if (ieee->current_network.qos_data.supported == 0) { |
329 | UP = 0; | 324 | UP = 0; |
330 | } else { | 325 | } else { |
331 | if (!IsACValid(TID)) { | ||
332 | netdev_warn(ieee->dev, "%s(): TID(%d) is not valid\n", | ||
333 | __func__, TID); | ||
334 | return false; | ||
335 | } | ||
336 | |||
337 | switch (TID) { | 326 | switch (TID) { |
338 | case 0: | 327 | case 0: |
339 | case 3: | 328 | case 3: |
@@ -351,6 +340,10 @@ bool GetTs(struct rtllib_device *ieee, struct ts_common_info **ppTS, | |||
351 | case 7: | 340 | case 7: |
352 | UP = 7; | 341 | UP = 7; |
353 | break; | 342 | break; |
343 | default: | ||
344 | netdev_warn(ieee->dev, "%s(): TID(%d) is not valid\n", | ||
345 | __func__, TID); | ||
346 | return false; | ||
354 | } | 347 | } |
355 | } | 348 | } |
356 | 349 | ||