diff options
| author | Cyan_Hsieh <cyanhsieh@google.com> | 2019-06-04 05:19:06 +0800 |
|---|---|---|
| committer | Cyan_Hsieh <cyanhsieh@google.com> | 2019-06-04 07:46:26 +0800 |
| commit | 431e40b883a61d93b7d56e6889d770018a2812f2 (patch) | |
| tree | 3e7afeae8351a1ef4da8090b2e89aafb6e39419d /ipacm/inc | |
| parent | 937e0ec76dbaad1418ae1ad64f888e51026d80b3 (diff) | |
| parent | 920ccb367b5b6ebf2557d0d99c12e657cab73c5a (diff) | |
| download | ipacfg-mgr-431e40b883a61d93b7d56e6889d770018a2812f2.tar.gz | |
Merge remote-tracking branch 'goog/qcom/release/LA.UM.8.1.C9.09.00.00.518.167' into qt-r1-devandroid-mainline-10.0.0_r9android-mainline-10.0.0_r7android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-10.0.0_r45android-10.0.0_r44android-10.0.0_r43android-10.0.0_r42android-10.0.0_r41android-10.0.0_r40android-10.0.0_r39android-10.0.0_r38android-10.0.0_r37android-10.0.0_r36android-10.0.0_r35android-10.0.0_r34android-10.0.0_r33android-10.0.0_r32android-10.0.0_r31android-10.0.0_r30android10-qpr3-s1-releaseandroid10-qpr3-releaseandroid10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-mainline-releaseandroid10-mainline-media-releaseandroid10-d4-s1-releaseandroid10-d4-release
Conflicts:
ipacm/src/Android.mk
Bug: 134087013
Change-Id: I945efee74f60a919916d4632a3e7c83512b61245
Diffstat (limited to 'ipacm/inc')
| -rw-r--r-- | ipacm/inc/IPACM_Defs.h | 1 | ||||
| -rw-r--r-- | ipacm/inc/IPACM_LanToLan.h | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ipacm/inc/IPACM_Defs.h b/ipacm/inc/IPACM_Defs.h index 59a8bb2..d2186b6 100644 --- a/ipacm/inc/IPACM_Defs.h +++ b/ipacm/inc/IPACM_Defs.h @@ -368,6 +368,7 @@ typedef struct _ipacm_event_iface_up_tether uint32_t if_index_tether; uint32_t ipv6_prefix[2]; bool is_sta; + uint8_t xlat_mux_id; }ipacm_event_iface_up_tehter; typedef enum diff --git a/ipacm/inc/IPACM_LanToLan.h b/ipacm/inc/IPACM_LanToLan.h index 66a1835..f1b7aae 100644 --- a/ipacm/inc/IPACM_LanToLan.h +++ b/ipacm/inc/IPACM_LanToLan.h @@ -45,9 +45,8 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifdef FEATURE_IPA_ANDROID #include <libxml/list.h> -#else/* defined(FEATURE_IPA_ANDROID) */ +#endif /* defined(FEATURE_IPA_ANDROID) */ #include <list> -#endif /* ndefined(FEATURE_IPA_ANDROID)*/ #define MAX_NUM_CACHED_CLIENT_ADD_EVENT 10 #define MAX_NUM_IFACE 10 |