OSDN Git Service

ipa: update wlan upstream iface name
authorMohammed Javid <mjavid@codeaurora.org>
Fri, 3 Aug 2018 09:26:35 +0000 (14:56 +0530)
committerGerrit - the friendly Code Review server <code-review@localhost>
Tue, 7 Aug 2018 17:32:51 +0000 (10:32 -0700)
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>
drivers/platform/msm/ipa/ipa_v2/rmnet_ipa.c
drivers/platform/msm/ipa/ipa_v3/rmnet_ipa.c

index c799780..e80d3ad 100644 (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;
index 900f507..af84508 100644 (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;