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

Commit 3890e7c1 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "icnss2: Setup DMS QMI client for WLAN MAC address"

parents 9aace5e3 05a4d865

drivers/net/wireless/cnss2/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -9,4 +9,4 @@ cnss2-y += debug.o 
cnss2-y += pci.o

cnss2-y += power.o

cnss2-y += genl.o

cnss2-$(CONFIG_CNSS2_QMI) += qmi.o coexistence_service_v01.o ip_multimedia_subsystem_private_service_v01.o device_management_service_v01.o
 
cnss2-$(CONFIG_CNSS2_QMI) += qmi.o coexistence_service_v01.o ip_multimedia_subsystem_private_service_v01.o

drivers/net/wireless/cnss_utils/Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only



obj-$(CONFIG_CNSS_UTILS) += cnss_utils.o

obj-$(CONFIG_CNSS_QMI_SVC) += wlan_firmware_service_v01.o
 
obj-$(CONFIG_CNSS_QMI_SVC) += wlan_firmware_service_v01.o device_management_service_v01.o

drivers/net/wireless/cnss2/device_management_service_v01.c→drivers/net/wireless/cnss_utils/device_management_service_v01.c

+7 −2
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/* Copyright (c) 2020, The Linux Foundation. All rights reserved. */

/* Copyright (c) 2020-2021, The Linux Foundation. All rights reserved. */



#include <linux/soc/qcom/qmi.h>



#include <linux/module.h>

#include "device_management_service_v01.h"



struct qmi_elem_info dms_get_mac_address_req_msg_v01_ei[] = {
@@ -22,6 +22,7 @@ struct qmi_elem_info dms_get_mac_address_req_msg_v01_ei[] = { 
		.tlv_type       = QMI_COMMON_TLV_TYPE,

	},

};

EXPORT_SYMBOL(dms_get_mac_address_req_msg_v01_ei);



struct qmi_elem_info dms_get_mac_address_resp_msg_v01_ei[] = {

	{
@@ -71,3 +72,7 @@ struct qmi_elem_info dms_get_mac_address_resp_msg_v01_ei[] = { 
		.tlv_type       = QMI_COMMON_TLV_TYPE,

	},

};

EXPORT_SYMBOL(dms_get_mac_address_resp_msg_v01_ei);



MODULE_LICENSE("GPL v2");

MODULE_DESCRIPTION("WLAN qmi service DMS");

drivers/net/wireless/cnss2/device_management_service_v01.h→drivers/net/wireless/cnss_utils/device_management_service_v01.h

+1 −1
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only

 * Copyright (c) 2020, The Linux Foundation. All rights reserved.

 * Copyright (c) 2020-2021, The Linux Foundation. All rights reserved.

 */



#ifndef DEVICE_MANAGEMENT_SERVICE_V01_H

drivers/soc/qcom/icnss2/debug.c

+3 −0
Original line number Diff line number Diff line
@@ -411,6 +411,9 @@ static int icnss_stats_show_state(struct seq_file *s, struct icnss_priv *priv) 
			continue;

		case ICNSS_COLD_BOOT_CAL:

			seq_puts(s, "COLD BOOT CALIBRATION");

			continue;

		case ICNSS_QMI_DMS_CONNECTED:

			seq_puts(s, "DMS_CONNECTED");

		}



		seq_printf(s, "UNKNOWN-%d", i);