aboutsummaryrefslogtreecommitdiff
path: root/data-ipa-cfg-mgr/ipacm/src
diff options
context:
space:
mode:
authorSkylar Chang <chiaweic@codeaurora.org>2018-08-21 11:23:58 -0700
committerDavide Garberi <dade.garberi@gmail.com>2018-11-02 15:23:13 +0100
commit973edaffa7188e6ae3b7eb9da40f62c196bdc4c2 (patch)
treec236d1369328e0bee6f7dea38e276010c36cbe82 /data-ipa-cfg-mgr/ipacm/src
parent11a056bbec4054e0931eb748de62db0601f4b226 (diff)
msm8996-common: ipacm: get usb_link_up from usb-driver
Made the change to get usb_link_up from usb-driver instead of using netlink event to resolve the timing issue between usb-driver and android framework. Also not self-posting the usb-up from downstream event which was used to support ipcam restart phase 3. Change-Id: I3549cfbfbb5f41fa5ed99a43f00c6d8b4333b8e5 Signed-off-by: Davide Garberi <dade.garberi@gmail.com>
Diffstat (limited to 'data-ipa-cfg-mgr/ipacm/src')
-rw-r--r--data-ipa-cfg-mgr/ipacm/src/IPACM_Netlink.cpp6
-rw-r--r--data-ipa-cfg-mgr/ipacm/src/IPACM_OffloadManager.cpp5
2 files changed, 4 insertions, 7 deletions
diff --git a/data-ipa-cfg-mgr/ipacm/src/IPACM_Netlink.cpp b/data-ipa-cfg-mgr/ipacm/src/IPACM_Netlink.cpp
index 5775ed2..fa0f7ac 100644
--- a/data-ipa-cfg-mgr/ipacm/src/IPACM_Netlink.cpp
+++ b/data-ipa-cfg-mgr/ipacm/src/IPACM_Netlink.cpp
@@ -686,7 +686,8 @@ static int ipa_nl_decode_nlmsg
evt_data.evt_data = data_fid;
IPACM_EvtDispatcher::PostEvt(&evt_data);
}
-
+ /* Andorid platform will use events from usb-driver directly */
+#ifndef FEATURE_IPA_ANDROID
/* Add IPACM support for ECM plug-in/plug_out */
/*--------------------------------------------------------------------------
Check if the interface is running.If its a RTM_NEWLINK and the interface
@@ -724,7 +725,7 @@ static int ipa_nl_decode_nlmsg
---------------------------------------------------------------------------*/
evt_data.event = IPA_USB_LINK_UP_EVENT;
evt_data.evt_data = data_fid;
- IPACMDBG_H("Posting usb IPA_LINK_UP_EVENT with if index: %d\n",
+ IPACMDBG_H("Posting usb IPA_USB_LINK_UP_EVENT with if index: %d\n",
data_fid->if_index);
IPACM_EvtDispatcher::PostEvt(&evt_data);
}
@@ -755,6 +756,7 @@ static int ipa_nl_decode_nlmsg
data_fid->if_index);
IPACM_EvtDispatcher::PostEvt(&evt_data);
}
+#endif /* not defined(FEATURE_IPA_ANDROID)*/
}
break;
diff --git a/data-ipa-cfg-mgr/ipacm/src/IPACM_OffloadManager.cpp b/data-ipa-cfg-mgr/ipacm/src/IPACM_OffloadManager.cpp
index a343b86..d09f444 100644
--- a/data-ipa-cfg-mgr/ipacm/src/IPACM_OffloadManager.cpp
+++ b/data-ipa-cfg-mgr/ipacm/src/IPACM_OffloadManager.cpp
@@ -234,11 +234,6 @@ RET IPACM_OffloadManager::addDownstream(const char * downstream_name, const Pref
{
IPACMDBG_H("addDownstream name(%s) currently not support in ipa \n", downstream_name);
-#ifdef FEATURE_IPACM_RESTART
- /* add ipacm restart support */
- push_iface_up(downstream_name, false);
-#endif
-
/* copy to the cache */
for(int i = 0; i < MAX_EVENT_CACHE ;i++)
{