Commit d56ee19a authored by YueHaibing's avatar YueHaibing Committed by Kalle Valo
Browse files

mwifiex: wmm: Fix -Wunused-const-variable warnings 



In file included from drivers/net/wireless/marvell/mwifiex//cmdevt.c:26:0:
drivers/net/wireless/marvell/mwifiex//wmm.h:41:17: warning: ‘tos_to_tid_inv’ defined but not used [-Wunused-const-variable=]
 static const u8 tos_to_tid_inv[] = {
                 ^~~~~~~~~~~~~~
drivers/net/wireless/marvell/mwifiex//wmm.h:34:18: warning: ‘mwifiex_1d_to_wmm_queue’ defined but not used [-Wunused-const-variable=]
 static const u16 mwifiex_1d_to_wmm_queue[8] = { 1, 0, 0, 1, 2, 2, 3, 3 };
                  ^~~~~~~~~~~~~~~~~~~~~~~

move the variables definition to .c file, and leave declarations
in the header file to fix these warnings.

Signed-off-by: default avatarYueHaibing <yuehaibing@huawei.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20200902140846.29024-1-yuehaibing@huawei.com
parent 8f8b8aa6

drivers/net/wireless/marvell/mwifiex/main.c

+2 −0
Original line number Diff line number Diff line
@@ -48,6 +48,8 @@ bool aggr_ctrl; 
module_param(aggr_ctrl, bool, 0000);

MODULE_PARM_DESC(aggr_ctrl, "usb tx aggregation enable:1, disable:0");



const u16 mwifiex_1d_to_wmm_queue[8] = { 1, 0, 0, 1, 2, 2, 3, 3 };



/*

 * This function registers the device and performs all the necessary

 * initializations.

drivers/net/wireless/marvell/mwifiex/wmm.c

+15 −0
Original line number Diff line number Diff line
@@ -40,6 +40,21 @@ 
static bool disable_tx_amsdu;

module_param(disable_tx_amsdu, bool, 0644);



/* 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.

 */

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

};



/* WMM information IE */

static const u8 wmm_info_ie[] = { WLAN_EID_VENDOR_SPECIFIC, 0x07,

	0x00, 0x50, 0xf2, 0x02,

drivers/net/wireless/marvell/mwifiex/wmm.h

+2 −16
Original line number Diff line number Diff line
@@ -31,22 +31,8 @@ enum ieee_types_wmm_ecw_bitmasks { 
	MWIFIEX_ECW_MAX = (BIT(4) | BIT(5) | BIT(6) | BIT(7)),

};



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};

extern const u16 mwifiex_1d_to_wmm_queue[];

extern const u8 tos_to_tid_inv[];



/*

 * This function retrieves the TID of the given RA list.