staging: wilc1000: refactor linux_wlan_init_test_config()
Refactor linux_wlan_init_test_config() to use correct endianness for wid values and remove unnecessary code. Signed-off-by: Ajay Singh <ajay.kathat@microchip.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Ajay Singh
Greg Kroah-Hartman
parent
3c55a24ee2
commit
9a4b45fb99
@ -304,204 +304,170 @@ static int wilc1000_firmware_download(struct net_device *dev)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int linux_wlan_init_test_config(struct net_device *dev,
|
||||
struct wilc_vif *vif)
|
||||
static int linux_wlan_init_fw_config(struct net_device *dev,
|
||||
struct wilc_vif *vif)
|
||||
{
|
||||
unsigned char c_val[64];
|
||||
struct wilc *wilc = vif->wilc;
|
||||
struct wilc_priv *priv;
|
||||
struct host_if_drv *hif_drv;
|
||||
u8 b;
|
||||
u16 hw;
|
||||
u32 w;
|
||||
|
||||
netdev_dbg(dev, "Start configuring Firmware\n");
|
||||
priv = wiphy_priv(dev->ieee80211_ptr->wiphy);
|
||||
hif_drv = (struct host_if_drv *)priv->hif_drv;
|
||||
netdev_dbg(dev, "Host = %p\n", hif_drv);
|
||||
wilc_get_chipid(wilc, false);
|
||||
|
||||
*(int *)c_val = 1;
|
||||
|
||||
if (!wilc_wlan_cfg_set(vif, 1, WID_SET_DRV_HANDLER, c_val, 4, 0, 0))
|
||||
goto fail;
|
||||
|
||||
c_val[0] = 0;
|
||||
if (!wilc_wlan_cfg_set(vif, 0, WID_PC_TEST_MODE, c_val, 1, 0, 0))
|
||||
goto fail;
|
||||
|
||||
c_val[0] = WILC_FW_BSS_TYPE_INFRA;
|
||||
if (!wilc_wlan_cfg_set(vif, 0, WID_BSS_TYPE, c_val, 1, 0, 0))
|
||||
goto fail;
|
||||
|
||||
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;
|
||||
|
||||
c_val[0] = WILC_FW_OPER_MODE_G_MIXED_11B_2;
|
||||
if (!wilc_wlan_cfg_set(vif, 0, WID_11G_OPERATING_MODE, c_val, 1, 0,
|
||||
0))
|
||||
goto fail;
|
||||
|
||||
c_val[0] = 1;
|
||||
if (!wilc_wlan_cfg_set(vif, 0, WID_CURRENT_CHANNEL, c_val, 1, 0, 0))
|
||||
goto fail;
|
||||
|
||||
c_val[0] = WILC_FW_PREAMBLE_SHORT;
|
||||
if (!wilc_wlan_cfg_set(vif, 0, WID_PREAMBLE, c_val, 1, 0, 0))
|
||||
goto fail;
|
||||
|
||||
c_val[0] = WILC_FW_11N_PROT_AUTO;
|
||||
if (!wilc_wlan_cfg_set(vif, 0, WID_11N_PROT_MECH, c_val, 1, 0, 0))
|
||||
goto fail;
|
||||
|
||||
c_val[0] = WILC_FW_ACTIVE_SCAN;
|
||||
if (!wilc_wlan_cfg_set(vif, 0, WID_SCAN_TYPE, c_val, 1, 0, 0))
|
||||
goto fail;
|
||||
|
||||
c_val[0] = WILC_FW_SITE_SURVEY_OFF;
|
||||
if (!wilc_wlan_cfg_set(vif, 0, WID_SITE_SURVEY, c_val, 1, 0, 0))
|
||||
goto fail;
|
||||
|
||||
*((int *)c_val) = 0xffff;
|
||||
if (!wilc_wlan_cfg_set(vif, 0, WID_RTS_THRESHOLD, c_val, 2, 0, 0))
|
||||
goto fail;
|
||||
|
||||
*((int *)c_val) = 2346;
|
||||
if (!wilc_wlan_cfg_set(vif, 0, WID_FRAG_THRESHOLD, c_val, 2, 0, 0))
|
||||
goto fail;
|
||||
|
||||
c_val[0] = 0;
|
||||
if (!wilc_wlan_cfg_set(vif, 0, WID_BCAST_SSID, c_val, 1, 0, 0))
|
||||
goto fail;
|
||||
|
||||
c_val[0] = 1;
|
||||
if (!wilc_wlan_cfg_set(vif, 0, WID_QOS_ENABLE, c_val, 1, 0, 0))
|
||||
goto fail;
|
||||
|
||||
c_val[0] = WILC_FW_NO_POWERSAVE;
|
||||
if (!wilc_wlan_cfg_set(vif, 0, WID_POWER_MANAGEMENT, c_val, 1, 0, 0))
|
||||
goto fail;
|
||||
|
||||
c_val[0] = WILC_FW_SEC_NO;
|
||||
if (!wilc_wlan_cfg_set(vif, 0, WID_11I_MODE, c_val, 1, 0, 0))
|
||||
goto fail;
|
||||
|
||||
c_val[0] = WILC_FW_AUTH_OPEN_SYSTEM;
|
||||
if (!wilc_wlan_cfg_set(vif, 0, WID_AUTH_TYPE, c_val, 1, 0, 0))
|
||||
goto fail;
|
||||
|
||||
strcpy(c_val, "123456790abcdef1234567890");
|
||||
if (!wilc_wlan_cfg_set(vif, 0, WID_WEP_KEY_VALUE, c_val,
|
||||
(strlen(c_val) + 1), 0, 0))
|
||||
goto fail;
|
||||
|
||||
strcpy(c_val, "12345678");
|
||||
if (!wilc_wlan_cfg_set(vif, 0, WID_11I_PSK, c_val, (strlen(c_val)), 0,
|
||||
0))
|
||||
goto fail;
|
||||
|
||||
strcpy(c_val, "password");
|
||||
if (!wilc_wlan_cfg_set(vif, 0, WID_1X_KEY, c_val, (strlen(c_val) + 1),
|
||||
w = vif->iftype;
|
||||
cpu_to_le32s(&w);
|
||||
if (!wilc_wlan_cfg_set(vif, 1, WID_SET_OPERATION_MODE, (u8 *)&w, 4,
|
||||
0, 0))
|
||||
goto fail;
|
||||
|
||||
c_val[0] = 192;
|
||||
c_val[1] = 168;
|
||||
c_val[2] = 1;
|
||||
c_val[3] = 112;
|
||||
if (!wilc_wlan_cfg_set(vif, 0, WID_1X_SERV_ADDR, c_val, 4, 0, 0))
|
||||
b = WILC_FW_BSS_TYPE_INFRA;
|
||||
if (!wilc_wlan_cfg_set(vif, 0, WID_BSS_TYPE, &b, 1, 0, 0))
|
||||
goto fail;
|
||||
|
||||
c_val[0] = 3;
|
||||
if (!wilc_wlan_cfg_set(vif, 0, WID_LISTEN_INTERVAL, c_val, 1, 0, 0))
|
||||
b = WILC_FW_TX_RATE_AUTO;
|
||||
if (!wilc_wlan_cfg_set(vif, 0, WID_CURRENT_TX_RATE, &b, 1, 0, 0))
|
||||
goto fail;
|
||||
|
||||
c_val[0] = 3;
|
||||
if (!wilc_wlan_cfg_set(vif, 0, WID_DTIM_PERIOD, c_val, 1, 0, 0))
|
||||
b = WILC_FW_OPER_MODE_G_MIXED_11B_2;
|
||||
if (!wilc_wlan_cfg_set(vif, 0, WID_11G_OPERATING_MODE, &b, 1, 0, 0))
|
||||
goto fail;
|
||||
|
||||
c_val[0] = WILC_FW_ACK_POLICY_NORMAL;
|
||||
if (!wilc_wlan_cfg_set(vif, 0, WID_ACK_POLICY, c_val, 1, 0, 0))
|
||||
b = WILC_FW_PREAMBLE_SHORT;
|
||||
if (!wilc_wlan_cfg_set(vif, 0, WID_PREAMBLE, &b, 1, 0, 0))
|
||||
goto fail;
|
||||
|
||||
c_val[0] = 0;
|
||||
if (!wilc_wlan_cfg_set(vif, 0, WID_USER_CONTROL_ON_TX_POWER, c_val, 1,
|
||||
b = WILC_FW_11N_PROT_AUTO;
|
||||
if (!wilc_wlan_cfg_set(vif, 0, WID_11N_PROT_MECH, &b, 1, 0, 0))
|
||||
goto fail;
|
||||
|
||||
b = WILC_FW_ACTIVE_SCAN;
|
||||
if (!wilc_wlan_cfg_set(vif, 0, WID_SCAN_TYPE, &b, 1, 0, 0))
|
||||
goto fail;
|
||||
|
||||
b = WILC_FW_SITE_SURVEY_OFF;
|
||||
if (!wilc_wlan_cfg_set(vif, 0, WID_SITE_SURVEY, &b, 1, 0, 0))
|
||||
goto fail;
|
||||
|
||||
hw = 0xffff;
|
||||
cpu_to_le16s(&hw);
|
||||
if (!wilc_wlan_cfg_set(vif, 0, WID_RTS_THRESHOLD, (u8 *)&hw, 2, 0, 0))
|
||||
goto fail;
|
||||
|
||||
hw = 2346;
|
||||
cpu_to_le16s(&hw);
|
||||
if (!wilc_wlan_cfg_set(vif, 0, WID_FRAG_THRESHOLD, (u8 *)&hw, 2, 0, 0))
|
||||
goto fail;
|
||||
|
||||
b = 0;
|
||||
if (!wilc_wlan_cfg_set(vif, 0, WID_BCAST_SSID, &b, 1, 0, 0))
|
||||
goto fail;
|
||||
|
||||
b = 1;
|
||||
if (!wilc_wlan_cfg_set(vif, 0, WID_QOS_ENABLE, &b, 1, 0, 0))
|
||||
goto fail;
|
||||
|
||||
b = WILC_FW_NO_POWERSAVE;
|
||||
if (!wilc_wlan_cfg_set(vif, 0, WID_POWER_MANAGEMENT, &b, 1, 0, 0))
|
||||
goto fail;
|
||||
|
||||
b = WILC_FW_SEC_NO;
|
||||
if (!wilc_wlan_cfg_set(vif, 0, WID_11I_MODE, &b, 1, 0, 0))
|
||||
goto fail;
|
||||
|
||||
b = WILC_FW_AUTH_OPEN_SYSTEM;
|
||||
if (!wilc_wlan_cfg_set(vif, 0, WID_AUTH_TYPE, &b, 1, 0, 0))
|
||||
goto fail;
|
||||
|
||||
b = 3;
|
||||
if (!wilc_wlan_cfg_set(vif, 0, WID_LISTEN_INTERVAL, &b, 1, 0, 0))
|
||||
goto fail;
|
||||
|
||||
b = 3;
|
||||
if (!wilc_wlan_cfg_set(vif, 0, WID_DTIM_PERIOD, &b, 1, 0, 0))
|
||||
goto fail;
|
||||
|
||||
b = WILC_FW_ACK_POLICY_NORMAL;
|
||||
if (!wilc_wlan_cfg_set(vif, 0, WID_ACK_POLICY, &b, 1, 0, 0))
|
||||
goto fail;
|
||||
|
||||
b = 0;
|
||||
if (!wilc_wlan_cfg_set(vif, 0, WID_USER_CONTROL_ON_TX_POWER, &b, 1,
|
||||
0, 0))
|
||||
goto fail;
|
||||
|
||||
c_val[0] = 48;
|
||||
if (!wilc_wlan_cfg_set(vif, 0, WID_TX_POWER_LEVEL_11A, c_val, 1, 0,
|
||||
b = 48;
|
||||
if (!wilc_wlan_cfg_set(vif, 0, WID_TX_POWER_LEVEL_11A, &b, 1, 0, 0))
|
||||
goto fail;
|
||||
|
||||
b = 28;
|
||||
if (!wilc_wlan_cfg_set(vif, 0, WID_TX_POWER_LEVEL_11B, &b, 1, 0, 0))
|
||||
goto fail;
|
||||
|
||||
hw = 100;
|
||||
cpu_to_le16s(&hw);
|
||||
if (!wilc_wlan_cfg_set(vif, 0, WID_BEACON_INTERVAL, (u8 *)&hw, 2, 0, 0))
|
||||
goto fail;
|
||||
|
||||
b = WILC_FW_REKEY_POLICY_DISABLE;
|
||||
if (!wilc_wlan_cfg_set(vif, 0, WID_REKEY_POLICY, &b, 1, 0, 0))
|
||||
goto fail;
|
||||
|
||||
w = 84600;
|
||||
cpu_to_le32s(&w);
|
||||
if (!wilc_wlan_cfg_set(vif, 0, WID_REKEY_PERIOD, (u8 *)&w, 4, 0, 0))
|
||||
goto fail;
|
||||
|
||||
w = 500;
|
||||
cpu_to_le32s(&w);
|
||||
if (!wilc_wlan_cfg_set(vif, 0, WID_REKEY_PACKET_COUNT, (u8 *)&w, 4, 0,
|
||||
0))
|
||||
goto fail;
|
||||
|
||||
c_val[0] = 28;
|
||||
if (!wilc_wlan_cfg_set(vif, 0, WID_TX_POWER_LEVEL_11B, c_val, 1, 0,
|
||||
b = 1;
|
||||
if (!wilc_wlan_cfg_set(vif, 0, WID_SHORT_SLOT_ALLOWED, &b, 1, 0,
|
||||
0))
|
||||
goto fail;
|
||||
|
||||
*((int *)c_val) = 100;
|
||||
if (!wilc_wlan_cfg_set(vif, 0, WID_BEACON_INTERVAL, c_val, 2, 0, 0))
|
||||
b = WILC_FW_ERP_PROT_SELF_CTS;
|
||||
if (!wilc_wlan_cfg_set(vif, 0, WID_11N_ERP_PROT_TYPE, &b, 1, 0, 0))
|
||||
goto fail;
|
||||
|
||||
c_val[0] = WILC_FW_REKEY_POLICY_DISABLE;
|
||||
if (!wilc_wlan_cfg_set(vif, 0, WID_REKEY_POLICY, c_val, 1, 0, 0))
|
||||
b = 1;
|
||||
if (!wilc_wlan_cfg_set(vif, 0, WID_11N_ENABLE, &b, 1, 0, 0))
|
||||
goto fail;
|
||||
|
||||
*((int *)c_val) = 84600;
|
||||
if (!wilc_wlan_cfg_set(vif, 0, WID_REKEY_PERIOD, c_val, 4, 0, 0))
|
||||
b = WILC_FW_11N_OP_MODE_HT_MIXED;
|
||||
if (!wilc_wlan_cfg_set(vif, 0, WID_11N_OPERATING_MODE, &b, 1, 0, 0))
|
||||
goto fail;
|
||||
|
||||
*((int *)c_val) = 500;
|
||||
if (!wilc_wlan_cfg_set(vif, 0, WID_REKEY_PACKET_COUNT, c_val, 4, 0,
|
||||
0))
|
||||
b = 1;
|
||||
if (!wilc_wlan_cfg_set(vif, 0, WID_11N_TXOP_PROT_DISABLE, &b, 1, 0, 0))
|
||||
goto fail;
|
||||
|
||||
c_val[0] = 1;
|
||||
if (!wilc_wlan_cfg_set(vif, 0, WID_SHORT_SLOT_ALLOWED, c_val, 1, 0,
|
||||
0))
|
||||
goto fail;
|
||||
|
||||
c_val[0] = WILC_FW_ERP_PROT_SELF_CTS;
|
||||
if (!wilc_wlan_cfg_set(vif, 0, WID_11N_ERP_PROT_TYPE, c_val, 1, 0, 0))
|
||||
goto fail;
|
||||
|
||||
c_val[0] = 1;
|
||||
if (!wilc_wlan_cfg_set(vif, 0, WID_11N_ENABLE, c_val, 1, 0, 0))
|
||||
goto fail;
|
||||
|
||||
c_val[0] = WILC_FW_11N_OP_MODE_HT_MIXED;
|
||||
if (!wilc_wlan_cfg_set(vif, 0, WID_11N_OPERATING_MODE, c_val, 1, 0,
|
||||
0))
|
||||
goto fail;
|
||||
|
||||
c_val[0] = 1;
|
||||
if (!wilc_wlan_cfg_set(vif, 0, WID_11N_TXOP_PROT_DISABLE, c_val, 1, 0,
|
||||
0))
|
||||
goto fail;
|
||||
|
||||
c_val[0] = WILC_FW_OBBS_NONHT_DETECT_PROTECT_REPORT;
|
||||
if (!wilc_wlan_cfg_set(vif, 0, WID_11N_OBSS_NONHT_DETECTION, c_val, 1,
|
||||
b = WILC_FW_OBBS_NONHT_DETECT_PROTECT_REPORT;
|
||||
if (!wilc_wlan_cfg_set(vif, 0, WID_11N_OBSS_NONHT_DETECTION, &b, 1,
|
||||
0, 0))
|
||||
goto fail;
|
||||
|
||||
c_val[0] = WILC_FW_HT_PROT_RTS_CTS_NONHT;
|
||||
if (!wilc_wlan_cfg_set(vif, 0, WID_11N_HT_PROT_TYPE, c_val, 1, 0, 0))
|
||||
b = WILC_FW_HT_PROT_RTS_CTS_NONHT;
|
||||
if (!wilc_wlan_cfg_set(vif, 0, WID_11N_HT_PROT_TYPE, &b, 1, 0, 0))
|
||||
goto fail;
|
||||
|
||||
c_val[0] = 0;
|
||||
if (!wilc_wlan_cfg_set(vif, 0, WID_11N_RIFS_PROT_ENABLE, c_val, 1, 0,
|
||||
b = 0;
|
||||
if (!wilc_wlan_cfg_set(vif, 0, WID_11N_RIFS_PROT_ENABLE, &b, 1, 0,
|
||||
0))
|
||||
goto fail;
|
||||
|
||||
c_val[0] = WILC_FW_SMPS_MODE_MIMO;
|
||||
if (!wilc_wlan_cfg_set(vif, 0, WID_11N_SMPS_MODE, c_val, 1, 0, 0))
|
||||
b = 7;
|
||||
if (!wilc_wlan_cfg_set(vif, 0, WID_11N_CURRENT_TX_MCS, &b, 1, 0, 0))
|
||||
goto fail;
|
||||
|
||||
c_val[0] = 7;
|
||||
if (!wilc_wlan_cfg_set(vif, 0, WID_11N_CURRENT_TX_MCS, c_val, 1, 0,
|
||||
0))
|
||||
goto fail;
|
||||
|
||||
c_val[0] = 1;
|
||||
if (!wilc_wlan_cfg_set(vif, 0, WID_11N_IMMEDIATE_BA_ENABLED, c_val, 1,
|
||||
b = 1;
|
||||
if (!wilc_wlan_cfg_set(vif, 0, WID_11N_IMMEDIATE_BA_ENABLED, &b, 1,
|
||||
1, 1))
|
||||
goto fail;
|
||||
|
||||
@ -671,7 +637,7 @@ static int wilc_wlan_initialize(struct net_device *dev, struct wilc_vif *vif)
|
||||
firmware_ver[size] = '\0';
|
||||
netdev_dbg(dev, "Firmware Ver = %s\n", firmware_ver);
|
||||
}
|
||||
ret = linux_wlan_init_test_config(dev, vif);
|
||||
ret = linux_wlan_init_fw_config(dev, vif);
|
||||
|
||||
if (ret < 0) {
|
||||
netdev_err(dev, "Failed to configure firmware\n");
|
||||
|
||||
@ -686,7 +686,6 @@ enum {
|
||||
WID_TX_POWER_LEVEL_11N = 0x00B1,
|
||||
|
||||
/* Custom Character WID list */
|
||||
WID_PC_TEST_MODE = 0x00C8,
|
||||
/* SCAN Complete notification WID*/
|
||||
WID_SCAN_COMPLETE = 0x00C9,
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user