Merge 8a81e5e0798cc834ed1f38b30cfb014b66593449 on remote branch (7bbe1e31) · Commits · e / devices / android_kernel_sony_msm8998

hif/src/sdio/native_sdio/src/hif.c

+4 −3

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.
		*
		* Permission to use, copy, modify, and/or distribute this software for
		* any purpose with or without fee is hereby granted, provided that the
		@@ -1398,7 +1398,7 @@ void hif_sdio_shutdown(struct hif_softc *hif_ctx)
		*/
		static void hif_irq_handler(struct sdio_func *func)
		{
		QDF_STATUS status;
		QDF_STATUS status = QDF_STATUS_SUCCESS;
		struct hif_sdio_dev *device;

		AR_DEBUG_PRINTF(ATH_DEBUG_TRACE,
		@@ -1410,6 +1410,7 @@ static void hif_irq_handler(struct sdio_func *func)
		* it when we process cmds
		*/
		sdio_release_host(device->func);
		if (device->htc_callbacks.dsrHandler)
		status = device->htc_callbacks.dsrHandler(device->htc_callbacks
		.context);
		sdio_claim_host(device->func);

+9 −3

Original line number	Diff line number	Diff line
		@@ -14193,7 +14193,10 @@ wmi_get_action_oui_id(enum wmi_action_oui_id action_id,
		static uint32_t
		wmi_get_action_oui_info_mask(uint32_t info_mask)
		{
		uint32_t info_presence = WMI_BEACON_INFO_PRESENCE_OUI_EXT;
		uint32_t info_presence = 0;

		if (info_mask & WMI_ACTION_OUI_INFO_OUI)
		info_presence \|= WMI_BEACON_INFO_PRESENCE_OUI_EXT;

		if (info_mask & WMI_ACTION_OUI_INFO_MAC_ADDRESS)
		info_presence \|= WMI_BEACON_INFO_PRESENCE_MAC_ADDRESS;
		@@ -14289,8 +14292,11 @@ wmi_fill_oui_extensions_buffer(struct wmi_action_oui_extension *extension,
		var_buf[0] = i;
		var_buf++;

		qdf_mem_copy(var_buf, extension->oui, extension->oui_length);
		if (extension->oui_length) {
		qdf_mem_copy(var_buf, extension->oui,
		extension->oui_length);
		var_buf += extension->oui_length;
		}

		if (extension->data_length) {
		qdf_mem_copy(var_buf, extension->data,