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

Commit 85264894 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge 810cb1cd on remote branch 

Change-Id: I46c652cdf552780bbe7a1928ecbb02ce10762715
parents cd82d90c 810cb1cd

core/hdd/src/wlan_hdd_power.c

+6 −0
Original line number Diff line number Diff line
@@ -1420,6 +1420,8 @@ QDF_STATUS hdd_wlan_shutdown(void) 
		scheduler_resume();

		hdd_ctx->is_scheduler_suspended = false;

		hdd_ctx->is_wiphy_suspended = false;

		ucfg_pmo_resume_all_components(hdd_ctx->psoc,

					       QDF_SYSTEM_SUSPEND);

	}



	wlan_hdd_rx_thread_resume(hdd_ctx);
@@ -1626,6 +1628,10 @@ QDF_STATUS hdd_wlan_re_init(void) 
		hdd_ssr_restart_sap(hdd_ctx);

	hdd_is_interface_down_during_ssr(hdd_ctx);

	hdd_wlan_ssr_reinit_event();



	if (hdd_ctx->hdd_wlan_suspended)

		hdd_ctx->hdd_wlan_suspended = false;



	return QDF_STATUS_SUCCESS;



err_re_init:

core/hdd/src/wlan_hdd_tx_rx.c

+7 −0
Original line number Diff line number Diff line
@@ -2064,6 +2064,13 @@ QDF_STATUS hdd_rx_pkt_thread_enqueue_cbk(void *adapter, 
	}



	vdev_id = hdd_adapter->vdev_id;



	if (vdev_id >= WLAN_UMAC_VDEV_ID_MAX) {

		hdd_info_rl("Vdev invalid. Dropping packets");

		qdf_nbuf_list_free(nbuf_list);

		return QDF_STATUS_E_NETDOWN;

	}



	head_ptr = nbuf_list;

	while (head_ptr) {

		qdf_nbuf_cb_update_vdev_id(head_ptr, vdev_id);

core/mac/inc/qwlan_version.h

+2 −2
Original line number Diff line number Diff line
@@ -32,9 +32,9 @@ 
#define QWLAN_VERSION_MAJOR            5

#define QWLAN_VERSION_MINOR            2

#define QWLAN_VERSION_PATCH            022

#define QWLAN_VERSION_EXTRA            "E"

#define QWLAN_VERSION_EXTRA            "G"

#define QWLAN_VERSION_BUILD            10



#define QWLAN_VERSIONSTR               "5.2.022.10E"

#define QWLAN_VERSIONSTR               "5.2.022.10G"



#endif /* QWLAN_VERSION_H */