diff options
author | Robin Peng <robinpeng@google.com> | 2018-12-19 15:27:04 +0800 |
---|---|---|
committer | Cyan_Hsieh <cyanhsieh@google.com> | 2018-12-24 14:18:05 +0800 |
commit | 540d8768a39dd74014866b1a81a60fefe5053710 (patch) | |
tree | 9d2f9b36f152996c46299dce2773f47dc109b0c8 /ipacm/src/IPACM_Lan.cpp | |
parent | ce02f0150343472caa230e7f6ff244c92ac98705 (diff) | |
parent | ada76e45c840024e231e6460f903dfc1f63ea6e0 (diff) | |
download | ipacfg-mgr-540d8768a39dd74014866b1a81a60fefe5053710.tar.gz |
Merge remote-tracking branch 'goog/qcom/release/LA.UM.7.8.9.C1.08.00.00.516.007'
Conflicts:
ipacm/src/IPACM_Iface.cpp
ipacm/src/IPACM_OffloadManager.cpp
Bug: 121228685
Change-Id: I8c74e755102e2d238379e6d1bc490ea15870616d
Diffstat (limited to 'ipacm/src/IPACM_Lan.cpp')
-rw-r--r-- | ipacm/src/IPACM_Lan.cpp | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/ipacm/src/IPACM_Lan.cpp b/ipacm/src/IPACM_Lan.cpp index 3a5a51a..fd06b1b 100644 --- a/ipacm/src/IPACM_Lan.cpp +++ b/ipacm/src/IPACM_Lan.cpp @@ -590,7 +590,8 @@ void IPACM_Lan::event_callback(ipa_cm_event_id event, void *param) if (data_wan_tether->is_sta == false) { ext_prop = IPACM_Iface::ipacmcfg->GetExtProp(IPA_IP_v4); - handle_wan_up_ex(ext_prop, IPA_IP_v4, 0); + handle_wan_up_ex(ext_prop, IPA_IP_v4, + IPACM_Wan::getXlat_Mux_Id()); } else { handle_wan_up(IPA_IP_v4); } @@ -772,7 +773,14 @@ void IPACM_Lan::event_callback(ipa_cm_event_id event, void *param) if (IPACM_Wan::backhaul_is_sta_mode == false) /* LTE */ { ext_prop = IPACM_Iface::ipacmcfg->GetExtProp(data->prefix.iptype); - handle_wan_up_ex(ext_prop, data->prefix.iptype, 0); + if (data->prefix.iptype == IPA_IP_v4) + { + handle_wan_up_ex(ext_prop, data->prefix.iptype, + IPACM_Wan::getXlat_Mux_Id()); + } + else { + handle_wan_up_ex(ext_prop, data->prefix.iptype, 0); + } } else { handle_wan_up(data->prefix.iptype); /* STA */ } @@ -2905,9 +2913,11 @@ int IPACM_Lan::handle_down_evt() IPACMDBG_H("LAN IF goes down, backhaul type %d\n", IPACM_Wan::backhaul_is_sta_mode); handle_wan_down(IPACM_Wan::backhaul_is_sta_mode); #ifdef FEATURE_IPA_ANDROID +#ifndef FEATURE_IPACM_HAL /* Clean-up tethered-iface list */ IPACM_Wan::delete_tether_iface(IPA_IP_v4, ipa_if_num); #endif +#endif } if (IPACM_Wan::isWanUP_V6(ipa_if_num) && rx_prop != NULL) |