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

Commit 7e4d4ac8 authored Aug 03, 2018 by Mohammed Javid Committed by Gerrit - the friendly Code Review server Aug 07, 2018

ipa: update wlan upstream iface name



Update WLAN upstream name to support STA SAP scenario
with wlan1 iface.

Change-Id: I0223c5b4aff8dfe24562a2c6d4ac581a7843224e
Acked-by: Pooja Kumari <kumarip@qti.qualcomm.com>
Signed-off-by: Mohammed Javid <mjavid@codeaurora.org>

parent cebe1742

drivers/platform/msm/ipa/ipa_v2/rmnet_ipa.c

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -53,6 +53,7 @@

	#define IPA_WWAN_DEV_NAME "rmnet_ipa%d"		#define IPA_WWAN_DEV_NAME "rmnet_ipa%d"
	#define IPA_UPSTEAM_WLAN_IFACE_NAME "wlan0"		#define IPA_UPSTEAM_WLAN_IFACE_NAME "wlan0"
			#define IPA_UPSTEAM_WLAN1_IFACE_NAME "wlan1"

	#define IPA_WWAN_DEVICE_COUNT (1)		#define IPA_WWAN_DEVICE_COUNT (1)

	@@ -790,7 +791,8 @@ static enum ipa_upstream_type find_upstream_type(const char *upstreamIface)
	return IPA_UPSTEAM_MODEM;		return IPA_UPSTEAM_MODEM;
	}		}

	if (strcmp(IPA_UPSTEAM_WLAN_IFACE_NAME, upstreamIface) == 0)		if ((strcmp(IPA_UPSTEAM_WLAN_IFACE_NAME, upstreamIface) == 0) \|\|
			(strcmp(IPA_UPSTEAM_WLAN1_IFACE_NAME, upstreamIface) == 0))
	return IPA_UPSTEAM_WLAN;		return IPA_UPSTEAM_WLAN;
	else		else
	return IPA_UPSTEAM_MAX;		return IPA_UPSTEAM_MAX;

drivers/platform/msm/ipa/ipa_v3/rmnet_ipa.c

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -53,6 +53,7 @@

	#define IPA_WWAN_DEV_NAME "rmnet_ipa%d"		#define IPA_WWAN_DEV_NAME "rmnet_ipa%d"
	#define IPA_UPSTEAM_WLAN_IFACE_NAME "wlan0"		#define IPA_UPSTEAM_WLAN_IFACE_NAME "wlan0"
			#define IPA_UPSTEAM_WLAN1_IFACE_NAME "wlan1"

	#define IPA_WWAN_RX_SOFTIRQ_THRESH 16		#define IPA_WWAN_RX_SOFTIRQ_THRESH 16

	@@ -820,7 +821,8 @@ static enum ipa_upstream_type find_upstream_type(const char *upstreamIface)
	return IPA_UPSTEAM_MODEM;		return IPA_UPSTEAM_MODEM;
	}		}

	if (strcmp(IPA_UPSTEAM_WLAN_IFACE_NAME, upstreamIface) == 0)		if ((strcmp(IPA_UPSTEAM_WLAN_IFACE_NAME, upstreamIface) == 0) \|\|
			(strcmp(IPA_UPSTEAM_WLAN1_IFACE_NAME, upstreamIface) == 0))
	return IPA_UPSTEAM_WLAN;		return IPA_UPSTEAM_WLAN;
	else		else
	return MAX_NUM_OF_MUX_CHANNEL;		return MAX_NUM_OF_MUX_CHANNEL;