diff options
| author | Skylar Chang <chiaweic@codeaurora.org> | 2014-05-24 01:26:42 -0700 |
|---|---|---|
| committer | Skylar Chang <chiaweic@codeaurora.org> | 2014-05-24 01:26:42 -0700 |
| commit | 11240567c31e1788914d790a9197d61cc048fe34 (patch) | |
| tree | 166ff61cccfdb10581aca0217403224429e19b23 /ipacm/src/IPACM_IfaceManager.cpp | |
| parent | 9e7caf98689f6cfd79d4c40b8711ba073bbcedcd (diff) | |
| download | ipacfg-mgr-11240567c31e1788914d790a9197d61cc048fe34.tar.gz | |
IPACM: read XML configuration for bridge name
Currently IPACM hard-coded to only recognize bridge
interface name as bridge0, in order to support more
flexibility, we make it as configurable paramter
in our IPACM configuration xml file.
Change-Id: I6eee418a269dd9ecbd2c723b266466e5e2295da5
Diffstat (limited to 'ipacm/src/IPACM_IfaceManager.cpp')
| -rw-r--r-- | ipacm/src/IPACM_IfaceManager.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/ipacm/src/IPACM_IfaceManager.cpp b/ipacm/src/IPACM_IfaceManager.cpp index 535a9c7..9c258a8 100644 --- a/ipacm/src/IPACM_IfaceManager.cpp +++ b/ipacm/src/IPACM_IfaceManager.cpp @@ -73,7 +73,7 @@ void IPACM_IfaceManager::event_callback(ipa_cm_event_id event, void *param) break; case IPA_LINK_UP_EVENT: IPACMDBG("link up %d: \n", evt_data->if_index); - create_iface_instance(evt_data->if_index, 0); + create_iface_instance(evt_data->if_index, Q6_WAN); break; case IPA_USB_LINK_UP_EVENT: @@ -81,13 +81,13 @@ void IPACM_IfaceManager::event_callback(ipa_cm_event_id event, void *param) /* check if it's WAN_IF */ if(IPACM_Iface::ipacmcfg->iface_table[ipa_interface_index].if_cat == WAN_IF) { - /* usb-backhaul using sta_mode 2*/ + /* usb-backhaul using sta_mode ECM_WAN*/ IPACMDBG("WAN-usb (%s) link up, iface: %d: \n", IPACM_Iface::ipacmcfg->iface_table[ipa_interface_index].iface_name,evt_data->if_index); - create_iface_instance(evt_data->if_index, 2); + create_iface_instance(evt_data->if_index, ECM_WAN); } else { - create_iface_instance(evt_data->if_index, 0); + create_iface_instance(evt_data->if_index, Q6_WAN); } break; @@ -98,7 +98,7 @@ void IPACM_IfaceManager::event_callback(ipa_cm_event_id event, void *param) { IPACM_Iface::ipacmcfg->iface_table[ipa_interface_index].if_cat=WLAN_IF; IPACMDBG("WLAN AP (%s) link up, iface: %d: \n", IPACM_Iface::ipacmcfg->iface_table[ipa_interface_index].iface_name,evt_data->if_index); - create_iface_instance(evt_data->if_index, 0); + create_iface_instance(evt_data->if_index, Q6_WAN); } else { @@ -111,10 +111,10 @@ void IPACM_IfaceManager::event_callback(ipa_cm_event_id event, void *param) /* change iface category from unknown to WAN_IF */ if(IPACM_Iface::ipacmcfg->iface_table[ipa_interface_index].if_cat==UNKNOWN_IF) { - /* wlan-backhaul using sta_mode 1 */ + /* wlan-backhaul using sta_mode WLAN_WAN */ IPACM_Iface::ipacmcfg->iface_table[ipa_interface_index].if_cat=WAN_IF; IPACMDBG("WLAN STA (%s) link up, iface: %d: \n", IPACM_Iface::ipacmcfg->iface_table[ipa_interface_index].iface_name,evt_data->if_index); - create_iface_instance(evt_data->if_index, 1); + create_iface_instance(evt_data->if_index, WLAN_WAN); } else { @@ -128,7 +128,7 @@ void IPACM_IfaceManager::event_callback(ipa_cm_event_id event, void *param) return; } -int IPACM_IfaceManager::create_iface_instance(int if_index, int is_sta_mode) +int IPACM_IfaceManager::create_iface_instance(int if_index, ipacm_wan_iface_type is_sta_mode) { int ipa_interface_index; ipa_interface_index = IPACM_Iface::iface_ipa_index_query(if_index); |