Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8dd0fc32 authored by Yu Wang's avatar Yu Wang
Browse files

cnss: merge cnss_wlan_status and cnss_driver_status 



In current cnss platform driver, there are 2 enumerations stand for
wlan status: cnss_wlan_status and cnss_driver_status; while in cnss2,
there is only 1: cnss_driver_status.
It will lead to mismatch when co-working with the same wlan driver.
To fix this problem, merge the 2 definitions, make these 2 platform
drivers aligned.

CRs-Fixed: 2202980
Change-Id: If398597e54d55a6fa4a2553e48cc16f0a9f7340d
Signed-off-by: default avatarYu Wang <yyuwang@codeaurora.org>
parent 49199a25

drivers/net/wireless/cnss/cnss_pci.c

+2 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2013-2017, The Linux Foundation. All rights reserved.

/* Copyright (c) 2013-2018, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -2732,7 +2732,7 @@ err_pcie_link_up: 
	cnss_wlan_vreg_set(vreg_info, VREG_OFF);

	if (penv->pdev) {

		if (wdrv && wdrv->update_status)

			wdrv->update_status(penv->pdev, CNSS_WLAN_SSR_FAIL);

			wdrv->update_status(penv->pdev, CNSS_SSR_FAIL);

		if (!penv->recovery_in_progress) {

			pr_err("%d: Unregistering pci device\n", __LINE__);

			pci_unregister_driver(&cnss_wlan_pci_driver);

include/net/cnss.h

+6 −8
Original line number Diff line number Diff line 
/* Copyright (c) 2013-2017, The Linux Foundation. All rights reserved.

/* Copyright (c) 2013-2018, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -37,11 +37,6 @@ enum cnss_cc_src { 
	CNSS_SOURCE_USER

};



enum cnss_wlan_status {

	CNSS_WLAN_LINK_DOWN,

	CNSS_WLAN_SSR_FAIL

};



/* FW image files */

struct cnss_fw_files {

	char image_file[CNSS_MAX_FILE_NAME];
@@ -107,11 +102,14 @@ struct cnss_platform_cap { 
	u32 cap_flag;

};



/* WLAN driver status */

/* WLAN driver status, keep it aligned with cnss2 */

enum cnss_driver_status {

	CNSS_UNINITIALIZED,

	CNSS_INITIALIZED,

	CNSS_LOAD_UNLOAD

	CNSS_LOAD_UNLOAD,

	CNSS_RECOVERY,

	CNSS_FW_DOWN,

	CNSS_SSR_FAIL,

};



enum cnss_runtime_request {