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

Commit 2ff97113 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ipa: update wlan upstream iface name"

parents 3aa6cd23 7e4d4ac8

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

+3 −1
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ 


#define IPA_WWAN_DEV_NAME "rmnet_ipa%d"

#define IPA_UPSTEAM_WLAN_IFACE_NAME "wlan0"

#define IPA_UPSTEAM_WLAN1_IFACE_NAME "wlan1"



#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;

	}



	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;

	else

		return IPA_UPSTEAM_MAX;

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

+3 −1
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ 


#define IPA_WWAN_DEV_NAME "rmnet_ipa%d"

#define IPA_UPSTEAM_WLAN_IFACE_NAME "wlan0"

#define IPA_UPSTEAM_WLAN1_IFACE_NAME "wlan1"



#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;

	}



	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;

	else

		return MAX_NUM_OF_MUX_CHANNEL;