diff options
| author | arnav_s <arnav_s@codeaurora.org> | 2017-12-06 13:42:26 -0700 |
|---|---|---|
| committer | arnav_s <arnav_s@codeaurora.org> | 2017-12-06 13:42:26 -0700 |
| commit | 0e38a37f4bc8809217b76be8d10fc3aded89320b (patch) | |
| tree | da34de5041d4017442d23e9468e1575f0a737e9c /ipacm/inc | |
| parent | bad4d1f535707a060d0bcb330c97e4a1bbbacfde (diff) | |
| parent | bb4759e1eb24372b823d15da74997121e224b1d3 (diff) | |
| download | ipacfg-mgr-0e38a37f4bc8809217b76be8d10fc3aded89320b.tar.gz | |
Fastforwarding data-ipa-cfg-mgr CRT:data.lnx.3.0-171203 to data.lnx.4.9
Change-Id: Ia8844805d90f0375d385f5c059547aa4dcdee351
Diffstat (limited to 'ipacm/inc')
| -rw-r--r-- | ipacm/inc/IPACM_Defs.h | 5 | ||||
| -rw-r--r-- | ipacm/inc/IPACM_Lan.h | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/ipacm/inc/IPACM_Defs.h b/ipacm/inc/IPACM_Defs.h index 2031fc5..149c03a 100644 --- a/ipacm/inc/IPACM_Defs.h +++ b/ipacm/inc/IPACM_Defs.h @@ -173,7 +173,7 @@ typedef enum IPA_HANDLE_WAN_UP, /* ipacm_event_iface_up */ IPA_HANDLE_WAN_DOWN, /* ipacm_event_iface_up */ - IPA_HANDLE_WAN_UP_V6, /* NULL */ + IPA_HANDLE_WAN_UP_V6, /* ipacm_event_iface_up */ IPA_HANDLE_WAN_DOWN_V6, /* NULL */ IPA_HANDLE_WAN_UP_TETHER, /* ipacm_event_iface_up_tehter */ IPA_HANDLE_WAN_DOWN_TETHER, /* ipacm_event_iface_up_tehter */ @@ -186,7 +186,7 @@ typedef enum IPA_ETH_BRIDGE_CLIENT_ADD, /* ipacm_event_eth_bridge */ IPA_ETH_BRIDGE_CLIENT_DEL, /* ipacm_event_eth_bridge*/ IPA_ETH_BRIDGE_WLAN_SCC_MCC_SWITCH, /* ipacm_event_eth_bridge*/ - IPA_LAN_DELETE_SELF, /* ipacm_event_data_fid */ + IPA_SSR_NOTICE, /* NULL*/ #ifdef FEATURE_L2TP IPA_ADD_VLAN_IFACE, /* ipa_ioc_vlan_iface_info */ IPA_DEL_VLAN_IFACE, /* ipa_ioc_vlan_iface_info */ @@ -195,6 +195,7 @@ typedef enum IPA_HANDLE_VLAN_CLIENT_INFO, /* ipacm_event_data_all */ IPA_HANDLE_VLAN_IFACE_INFO, /* ipacm_event_data_all */ #endif + IPA_LAN_DELETE_SELF, /* ipacm_event_data_fid */ IPACM_EVENT_MAX } ipa_cm_event_id; diff --git a/ipacm/inc/IPACM_Lan.h b/ipacm/inc/IPACM_Lan.h index 0f50ae7..21a72c1 100644 --- a/ipacm/inc/IPACM_Lan.h +++ b/ipacm/inc/IPACM_Lan.h @@ -263,7 +263,9 @@ protected: bool is_active; bool modem_ul_v4_set; + uint8_t v4_mux_id; bool modem_ul_v6_set; + uint8_t v6_mux_id; bool sta_ul_v4_set; bool sta_ul_v6_set; |