diff options
| author | Skylar Chang <chiaweic@codeaurora.org> | 2018-08-21 11:23:58 -0700 |
|---|---|---|
| committer | Mohammed <mjavid@codeaurora.org> | 2018-11-06 17:31:51 +0530 |
| commit | 5d291c59ec81983ba42d119d90a0e4f87de29dec (patch) | |
| tree | eefafc39092f6a791675f3876c5cd7d209e37134 | |
| parent | ada76e45c840024e231e6460f903dfc1f63ea6e0 (diff) | |
| download | ipacfg-mgr-5d291c59ec81983ba42d119d90a0e4f87de29dec.tar.gz | |
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
| -rw-r--r-- | ipacm/src/IPACM_Netlink.cpp | 6 | ||||
| -rw-r--r-- | ipacm/src/IPACM_OffloadManager.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ipacm/src/IPACM_Netlink.cpp b/ipacm/src/IPACM_Netlink.cpp index 9c35497..fa4b8b7 100644 --- a/ipacm/src/IPACM_Netlink.cpp +++ b/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 @@ -723,7 +724,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); } @@ -754,6 +755,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/ipacm/src/IPACM_OffloadManager.cpp b/ipacm/src/IPACM_OffloadManager.cpp index d9a9f4b..4fd6980 100644 --- a/ipacm/src/IPACM_OffloadManager.cpp +++ b/ipacm/src/IPACM_OffloadManager.cpp @@ -233,8 +233,6 @@ RET IPACM_OffloadManager::addDownstream(const char * downstream_name, const Pref if (cache_need) { IPACMDBG_H("addDownstream name(%s) currently not support in ipa \n", downstream_name); - /* add ipacm restart support */ - push_iface_up(downstream_name, false); /* copy to the cache */ for(int i = 0; i < MAX_EVENT_CACHE ;i++) |