evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "ipa: update wlan upstream iface name"

Browse source
This commit is contained in:
Linux Build Service Account 2018-08-07 15:24:16 -07:00 • committed by Gerrit - the friendly Code Review server
commit 9656c6c641
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/platform/msm/ipa/ipa_v2/rmnet_ipa.c
View file

@ -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)
@ -800,7 +801,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;

4
drivers/platform/msm/ipa/ipa_v3/rmnet_ipa.c
View file

@ -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
@ -814,7 +815,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;