[PATCH 16/28] wireless: marvell: mwifiex: init: Move 'tos_to_tid_inv' to where it's used
From: Lee Jones <hidden>
Date: 2020-08-19 07:26:12
Also in:
linux-wireless, lkml
Subsystem:
marvell mwifiex wireless driver, the rest · Maintainers:
Brian Norris, Linus Torvalds
'tos_to_tid_inv' is only used in 2 of 17 files it's current being
included into.
Fixes the following W=1 kernel build warning(s):
In file included from drivers/net/wireless/marvell/mwifiex/main.c:23:
In file included from drivers/net/wireless/marvell/mwifiex/cmdevt.c:26:
In file included from drivers/net/wireless/marvell/mwifiex/util.c:25:
In file included from drivers/net/wireless/marvell/mwifiex/txrx.c:25:
In file included from drivers/net/wireless/marvell/mwifiex/11n.c:25:
In file included from drivers/net/wireless/marvell/mwifiex/wmm.c:25:
In file included from drivers/net/wireless/marvell/mwifiex/11n_aggr.c:25:
In file included from drivers/net/wireless/marvell/mwifiex/11n_rxreorder.c:25:
In file included from drivers/net/wireless/marvell/mwifiex/join.c:25:
In file included from drivers/net/wireless/marvell/mwifiex/sta_cmd.c:25:
In file included from drivers/net/wireless/marvell/mwifiex/sta_ioctl.c:25:
In file included from drivers/net/wireless/marvell/mwifiex/sta_event.c:25:
In file included from drivers/net/wireless/marvell/mwifiex/uap_txrx.c:23:
In file included from drivers/net/wireless/marvell/mwifiex/sdio.c:27:
In file included from drivers/net/wireless/marvell/mwifiex/sta_tx.c:25:
drivers/net/wireless/marvell/mwifiex/wmm.h:41:17: warning: ‘tos_to_tid_inv’ defined but not used [-Wunused-const-variable=]
41 | static const u8 tos_to_tid_inv[] = {
NB: Snipped for brevity
Cc: Amitkumar Karwar <redacted>
Cc: Ganapathi Bhat <redacted>
Cc: Xinming Hu <redacted>
Cc: Kalle Valo <redacted>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Jakub Kicinski <kuba@kernel.org>
Cc: linux-wireless@vger.kernel.org
Cc: netdev@vger.kernel.org
Signed-off-by: Lee Jones <redacted>
---
drivers/net/wireless/marvell/mwifiex/init.c | 16 ++++++++++++++++
drivers/net/wireless/marvell/mwifiex/tdls.c | 16 ++++++++++++++++
drivers/net/wireless/marvell/mwifiex/wmm.h | 15 ---------------
3 files changed, 32 insertions(+), 15 deletions(-)
diff --git a/drivers/net/wireless/marvell/mwifiex/init.c b/drivers/net/wireless/marvell/mwifiex/init.c
index 82d69bc3aaaf4..7ffc78b258317 100644
--- a/drivers/net/wireless/marvell/mwifiex/init.c
+++ b/drivers/net/wireless/marvell/mwifiex/init.c@@ -25,6 +25,22 @@ #include "wmm.h" #include "11n.h" +/* + * This table inverses the tos_to_tid operation to get a priority + * which is in sequential order, and can be compared. + * Use this to compare the priority of two different TIDs. + */ +static const u8 tos_to_tid_inv[] = { + 0x02, /* from tos_to_tid[2] = 0 */ + 0x00, /* from tos_to_tid[0] = 1 */ + 0x01, /* from tos_to_tid[1] = 2 */ + 0x03, + 0x04, + 0x05, + 0x06, + 0x07 +}; + /* * This function adds a BSS priority table to the table list. *
diff --git a/drivers/net/wireless/marvell/mwifiex/tdls.c b/drivers/net/wireless/marvell/mwifiex/tdls.c
index 97bb87c3676bb..35c02b149820d 100644
--- a/drivers/net/wireless/marvell/mwifiex/tdls.c
+++ b/drivers/net/wireless/marvell/mwifiex/tdls.c@@ -27,6 +27,22 @@ #define TDLS_CONFIRM_FIX_LEN 6 #define MWIFIEX_TDLS_WMM_INFO_SIZE 7 +/* + * This table inverses the tos_to_tid operation to get a priority + * which is in sequential order, and can be compared. + * Use this to compare the priority of two different TIDs. + */ +static const u8 tos_to_tid_inv[] = { + 0x02, /* from tos_to_tid[2] = 0 */ + 0x00, /* from tos_to_tid[0] = 1 */ + 0x01, /* from tos_to_tid[1] = 2 */ + 0x03, + 0x04, + 0x05, + 0x06, + 0x07 +}; + static void mwifiex_restore_tdls_packets(struct mwifiex_private *priv, const u8 *mac, u8 status) {
diff --git a/drivers/net/wireless/marvell/mwifiex/wmm.h b/drivers/net/wireless/marvell/mwifiex/wmm.h
index 04d7da95e3078..60bdbb82277a3 100644
--- a/drivers/net/wireless/marvell/mwifiex/wmm.h
+++ b/drivers/net/wireless/marvell/mwifiex/wmm.h@@ -33,21 +33,6 @@ enum ieee_types_wmm_ecw_bitmasks { static const u16 mwifiex_1d_to_wmm_queue[8] = { 1, 0, 0, 1, 2, 2, 3, 3 }; -/* - * This table inverses the tos_to_tid operation to get a priority - * which is in sequential order, and can be compared. - * Use this to compare the priority of two different TIDs. - */ -static const u8 tos_to_tid_inv[] = { - 0x02, /* from tos_to_tid[2] = 0 */ - 0x00, /* from tos_to_tid[0] = 1 */ - 0x01, /* from tos_to_tid[1] = 2 */ - 0x03, - 0x04, - 0x05, - 0x06, - 0x07}; - /* * This function retrieves the TID of the given RA list. */
--
2.25.1