Commit c140dd91 authored by Ajay Singh's avatar Ajay Singh Committed by Greg Kroah-Hartman
Browse files

staging: wilc1000: move current_tx_rate enum to wilc_wlan_if.h file 



Move 'current_tx_rate' enum to wilc_wlan_if.h, to have it along with the
other FW related to constants. Also added prefix to have a better
namespace.

Signed-off-by: default avatarAjay Singh <ajay.kathat@microchip.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b997b84f

drivers/staging/wilc1000/host_interface.h

+0 −16
Original line number Diff line number Diff line
@@ -127,22 +127,6 @@ struct host_if_pmkid_attr { 
	struct host_if_pmkid pmkidlist[WILC_MAX_NUM_PMKIDS];

};



enum current_tx_rate {

	AUTORATE	= 0,

	MBPS_1		= 1,

	MBPS_2		= 2,

	MBPS_5_5	= 5,

	MBPS_11		= 11,

	MBPS_6		= 6,

	MBPS_9		= 9,

	MBPS_12		= 12,

	MBPS_18		= 18,

	MBPS_24		= 24,

	MBPS_36		= 36,

	MBPS_48		= 48,

	MBPS_54		= 54

};



struct cfg_param_attr {

	u32 flag;

	u16 short_retry_limit;

drivers/staging/wilc1000/linux_wlan.c

+1 −1
Original line number Diff line number Diff line
@@ -342,7 +342,7 @@ static int linux_wlan_init_test_config(struct net_device *dev, 
	if (!wilc_wlan_cfg_set(vif, 0, WID_BSS_TYPE, c_val, 1, 0, 0))

		goto fail;



	c_val[0] = AUTORATE;

	c_val[0] = WILC_FW_TX_RATE_AUTO;

	if (!wilc_wlan_cfg_set(vif, 0, WID_CURRENT_TX_RATE, c_val, 1, 0, 0))

		goto fail;

drivers/staging/wilc1000/wilc_wlan_if.h

+16 −0
Original line number Diff line number Diff line
@@ -193,6 +193,22 @@ enum { 
	WILC_FW_SMPS_MODE_MIMO = 3,	/* power save disable */

};



enum {

	WILC_FW_TX_RATE_AUTO = 0,

	WILC_FW_TX_RATE_MBPS_1 = 1,

	WILC_FW_TX_RATE_MBPS_2 = 2,

	WILC_FW_TX_RATE_MBPS_5_5 = 5,

	WILC_FW_TX_RATE_MBPS_11 = 11,

	WILC_FW_TX_RATE_MBPS_6 = 6,

	WILC_FW_TX_RATE_MBPS_9 = 9,

	WILC_FW_TX_RATE_MBPS_12 = 12,

	WILC_FW_TX_RATE_MBPS_18 = 18,

	WILC_FW_TX_RATE_MBPS_24 = 24,

	WILC_FW_TX_RATE_MBPS_36 = 36,

	WILC_FW_TX_RATE_MBPS_48 = 48,

	WILC_FW_TX_RATE_MBPS_54 = 54

};



enum wid_type {

	WID_CHAR		= 0,

	WID_SHORT		= 1,

CRA Git | Maintained and supported by SUSTech CRA and CCSE