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

Commit f298474a authored by Daniel Jacob Chittoor's avatar Daniel Jacob Chittoor
Browse files

Merge commit '1a059732' into HEAD 

* commit '1a059732':
  Squashed 'drivers/staging/qca-wifi-host-cmn/' changes from 3ecb182f..7f0758786719
parents 1fcdc7e1 1a059732

drivers/staging/qca-wifi-host-cmn/cfg/inc/cfg_converged.h

+4 −2
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved.

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

 *

 * Permission to use, copy, modify, and/or distribute this software for

 * any purpose with or without fee is hereby granted, provided that the
@@ -25,6 +25,7 @@ 


#include <wlan_scan_cfg.h>

#include "cfg_dp.h"

#include "cfg_hif.h"

#include <wlan_extscan_cfg.h>

#ifdef WLAN_SUPPORT_GREEN_AP

#include "cfg_green_ap_params.h"
@@ -38,7 +39,8 @@ 
		CFG_DP \

		CFG_EXTSCAN_ALL \

		CFG_GREEN_AP_ALL \

		CFG_SPECTRAL_ALL

		CFG_SPECTRAL_ALL \

		CFG_HIF



#endif /* __CFG_CONVERGED_H */

drivers/staging/qca-wifi-host-cmn/cfg/inc/cfg_define.h

+4 −4
Original line number Diff line number Diff line 
/*

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

 * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved.

 *

 * Permission to use, copy, modify, and/or distribute this software for

 * any purpose with or without fee is hereby granted, provided that the
@@ -85,10 +85,10 @@ enum cfg_fallback_behavior { 
	(NON_INI, IPV6, struct qdf_ipv6_addr, name, -1, -1, -1, desc, def)



/* utility macros/functions */

#ifdef CONFIG_MCL

#define MCL_OR_WIN_VALUE(mcl_value, win_value) mcl_value

#ifdef CONFIG_AP_PLATFORM

#define PLATFORM_VALUE(non_ap_value, ap_value) ap_value

#else

#define MCL_OR_WIN_VALUE(mcl_value, win_value) win_value

#define PLATFORM_VALUE(non_ap_value, ap_value) non_ap_value

#endif



#endif /* __CFG_DEFINE_H */

drivers/staging/qca-wifi-host-cmn/cfg/inc/i_cfg.h

+2 −1
Original line number Diff line number Diff line
@@ -70,7 +70,8 @@ struct cfg_values { 


struct cfg_values *cfg_psoc_get_values(struct wlan_objmgr_psoc *psoc);



#define __cfg_get(psoc, id) (cfg_psoc_get_values(psoc)->id##_internal)

#define __cfg_get(psoc, id) (cfg_psoc_get_values( \

			(struct wlan_objmgr_psoc *)psoc)->id##_internal)



#endif /* __I_CFG_H */

drivers/staging/qca-wifi-host-cmn/cfg/src/cfg.c

+6 −5
Original line number Diff line number Diff line
@@ -234,8 +234,8 @@ cfg_mac_item_handler(struct cfg_value_store *store, 
		return;



	cfg_err("%s=%s - Invalid format (status %d); Using default "

		QDF_MAC_ADDR_STR, meta->name, str_value, status,

		QDF_MAC_ADDR_ARRAY(store_value->bytes));

		QDF_MAC_ADDR_FMT, meta->name, str_value, status,

		QDF_MAC_ADDR_REF(store_value->bytes));

}



static __attribute__((unused)) void
@@ -539,7 +539,8 @@ cfg_store_print(struct wlan_objmgr_psoc *psoc) 


#undef __CFG_INI_MAC

#define __CFG_INI_MAC(id, mtype, ctype, name, desc, def...) \

	cfg_nofl_debug("%s %pM", name, (&store->values.id##_internal)->bytes);

	cfg_nofl_debug("%s "QDF_MAC_ADDR_FMT, name, \

	QDF_MAC_ADDR_REF((&store->values.id##_internal)->bytes));



#undef __CFG_INI_IPV4

#define __CFG_INI_IPV4(id, mtype, ctype, name, desc, def...) \
@@ -591,8 +592,8 @@ cfg_ini_config_print(struct wlan_objmgr_psoc *psoc, uint8_t *buf, 
#undef __CFG_INI_MAC

#define __CFG_INI_MAC(id, mtype, ctype, name, desc, def...) \

	do { \

		len = qdf_scnprintf(buf, buflen, "%s %pM\n", name, \

				    (&store->values.id##_internal)->bytes); \

		len = qdf_scnprintf(buf, buflen, "%s "QDF_MAC_ADDR_FMT"\n", name, \

				    QDF_MAC_ADDR_REF((&store->values.id##_internal)->bytes)); \

		buf += len; \

		buflen -= len; \

	} while (0);

drivers/staging/qca-wifi-host-cmn/dp/cmn_dp_api/dp_cal_client_api.c

+13 −4
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2017-2018 The Linux Foundation. All rights reserved.

 * Copyright (c) 2017-2019 The Linux Foundation. All rights reserved.

 *

 * Permission to use, copy, modify, and/or distribute this software for

 * any purpose with or without fee is hereby granted, provided that the
@@ -27,9 +27,10 @@ 
 *

 * return: void

 */

void dp_cal_client_attach(void **cal_client_ctx, void *pdev,

void dp_cal_client_attach(struct cdp_cal_client **cal_client_ctx,

			  struct cdp_pdev *pdev,

			  qdf_device_t osdev,

			  void (*dp_iterate_peer_list)(void *))

			  void (*dp_iterate_peer_list)(struct cdp_pdev *))

{

	struct cal_client *cal_cl;
@@ -54,7 +55,7 @@ qdf_export_symbol(dp_cal_client_attach); 
 *

 * return: void

 */

void dp_cal_client_detach(void **cal_client_ctx)

void dp_cal_client_detach(struct cdp_cal_client **cal_client_ctx)

{

	struct cal_client *cal_cl;
@@ -147,6 +148,14 @@ void dp_cal_client_update_peer_stats(struct cdp_peer_stats *peer_stats) 
	peer_stats->tx.tx_data_ucast_rate = temp_tx_ucast_pkts -

					peer_stats->tx.tx_data_ucast_last;



	/* Check tx and rx packets in last one second, and increment

	 * inactive time for peer

	 */

	if (peer_stats->tx.tx_data_rate || peer_stats->rx.rx_data_rate)

		peer_stats->tx.inactive_time = 0;

	else

		peer_stats->tx.inactive_time++;



	peer_stats->rx.rx_bytes_success_last = temp_rx_bytes;

	peer_stats->rx.rx_data_success_last = temp_rx_data;

	peer_stats->tx.tx_bytes_success_last = temp_tx_bytes;