Merge "msm: ipa2: Add additional changes to msm-4.9"
diff --git a/drivers/platform/msm/ipa/ipa_clients/rndis_ipa.c b/drivers/platform/msm/ipa/ipa_clients/rndis_ipa.c
index 4f60896..ad23d82 100644
--- a/drivers/platform/msm/ipa/ipa_clients/rndis_ipa.c
+++ b/drivers/platform/msm/ipa/ipa_clients/rndis_ipa.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2017, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2013-2018, The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@@ -574,13 +574,15 @@
goto fail_set_device_ethernet;
}
RNDIS_IPA_DEBUG("Device Ethernet address set %pM\n", net->dev_addr);
-
+#ifdef CONFIG_IPA3
if (ipa_is_vlan_mode(IPA_VLAN_IF_RNDIS,
&rndis_ipa_ctx->is_vlan_mode)) {
RNDIS_IPA_ERROR("couldn't acquire vlan mode, is ipa ready?\n");
- goto fail_get_vlan_mode;
+ goto fail_hdrs_cfg;
}
-
+#else
+ rndis_ipa_ctx->is_vlan_mode = 0;
+#endif
RNDIS_IPA_DEBUG("is_vlan_mode %d\n", rndis_ipa_ctx->is_vlan_mode);
result = rndis_ipa_hdrs_cfg
@@ -631,7 +633,6 @@
fail_register_tx:
rndis_ipa_hdrs_destroy(rndis_ipa_ctx);
fail_hdrs_cfg:
-fail_get_vlan_mode:
fail_set_device_ethernet:
rndis_ipa_debugfs_destroy(rndis_ipa_ctx);
fail_netdev_priv:
diff --git a/drivers/platform/msm/ipa/ipa_v2/ipa.c b/drivers/platform/msm/ipa/ipa_v2/ipa.c
index f19e9d6..52ffa52 100644
--- a/drivers/platform/msm/ipa/ipa_v2/ipa.c
+++ b/drivers/platform/msm/ipa/ipa_v2/ipa.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012-2017, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2012-2018, The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@@ -3591,8 +3591,8 @@
IPA_ACTIVE_CLIENTS_DEC_SIMPLE();
} else {
IPADBG_LOW("clocks are gated, not setting rate\n");
+ ipa_active_clients_unlock();
}
- ipa_active_clients_unlock();
IPADBG_LOW("Done\n");
return 0;
}
diff --git a/drivers/platform/msm/ipa/ipa_v2/ipa_utils.c b/drivers/platform/msm/ipa/ipa_v2/ipa_utils.c
index 8a3fbd4..e06f6cf 100644
--- a/drivers/platform/msm/ipa/ipa_v2/ipa_utils.c
+++ b/drivers/platform/msm/ipa/ipa_v2/ipa_utils.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012-2017, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2012-2018, The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@@ -161,6 +161,7 @@
[IPA_2_0][IPA_CLIENT_TEST4_CONS] = {true, 15},
+ [IPA_2_6L][IPA_CLIENT_USB_PROD] = {true, 1},
[IPA_2_6L][IPA_CLIENT_APPS_LAN_WAN_PROD] = {true, 4},
[IPA_2_6L][IPA_CLIENT_APPS_CMD_PROD] = {true, 3},
[IPA_2_6L][IPA_CLIENT_Q6_LAN_PROD] = {true, 6},