IPACM: Add Ethernet bridging central controller

Add central controller for Ethernet bridging.

Change-Id: Icb5657f78324e6fe342ba7da18c2b054f678ce96
Signed-off-by: Valery Gorohovsky <valeryg@codeaurora.org>

1 files changed, 6 insertions, 39 deletions

diff --git a/ipacm/src/IPACM_Config.cpp b/ipacm/src/IPACM_Config.cpp
index 5371202..a84f64c 100644
--- a/ipacm/src/IPACM_Config.cpp
+++ b/ipacm/src/IPACM_Config.cpp
@@ -99,16 +99,12 @@ const char *ipacm_event_name[] = {
 	__stringify(IPA_HANDLE_WAN_DOWN_V6_TETHER),            /* ipacm_event_iface_up_tehter */
 	__stringify(IPA_HANDLE_WLAN_UP),                       /* ipacm_event_iface_up */
 	__stringify(IPA_HANDLE_LAN_UP),                        /* ipacm_event_iface_up */
-	__stringify(IPA_LAN_CLIENT_ACTIVE),                    /* ipacm_event_lan_client*/
-	__stringify(IPA_LAN_CLIENT_INACTIVE),                  /* ipacm_event_lan_client*/
-	__stringify(IPA_LAN_CLIENT_DISCONNECT),                /* ipacm_event_lan_client*/
-	__stringify(IPA_LAN_CLIENT_POWER_SAVE),                /* ipacm_event_lan_client*/
-	__stringify(IPA_LAN_CLIENT_POWER_RECOVER),             /* ipacm_event_lan_client*/
+	__stringify(IPA_ETH_BRIDGE_IFACE_UP),                  /* ipacm_event_eth_bridge*/
+	__stringify(IPA_ETH_BRIDGE_IFACE_DOWN),                /* ipacm_event_eth_bridge*/
+	__stringify(IPA_ETH_BRIDGE_CLIENT_ADD),                /* ipacm_event_eth_bridge*/
+	__stringify(IPA_ETH_BRIDGE_CLIENT_DEL),                /* ipacm_event_eth_bridge*/
+	__stringify(IPA_ETH_BRIDGE_WLAN_SCC_MCC_SWITCH),       /* ipacm_event_eth_bridge*/
 	__stringify(IPA_LAN_DELETE_SELF),                      /* ipacm_event_data_fid */
-	__stringify(IPA_ETH_BRIDGE_CLIENT_ADD_EVENT),          /* ipacm_event_data_mac */
-	__stringify(IPA_ETH_BRIDGE_CLIENT_DEL_EVENT),          /* ipacm_event_data_mac */
-	__stringify(IPA_ETH_BRIDGE_HDR_PROC_CTX_SET_EVENT),    /* ipacm_event_data_if_cat */
-	__stringify(IPA_ETH_BRIDGE_HDR_PROC_CTX_UNSET_EVENT),  /* ipacm_event_data_if_cat */
 	__stringify(IPACM_EVENT_MAX),
 };
 
@@ -145,11 +141,6 @@ IPACM_Config::IPACM_Config()
 	memset(&ext_prop_v4, 0, sizeof(ext_prop_v4));
 	memset(&ext_prop_v6, 0, sizeof(ext_prop_v6));
 
-	memset(&rt_tbl_eth_bridge_lan_wlan_v4, 0, sizeof(rt_tbl_eth_bridge_lan_wlan_v4));
-	memset(&rt_tbl_eth_bridge_wlan_wlan_v4, 0, sizeof(rt_tbl_eth_bridge_wlan_wlan_v4));
-	memset(&rt_tbl_eth_bridge_lan_wlan_v6, 0, sizeof(rt_tbl_eth_bridge_lan_wlan_v6));
-	memset(&rt_tbl_eth_bridge_wlan_wlan_v6, 0, sizeof(rt_tbl_eth_bridge_wlan_wlan_v6));
-
 	qmap_id = ~0;
 
 	memset(flt_rule_count_v4, 0, (IPA_CLIENT_CONS - IPA_CLIENT_PROD)*sizeof(int));
@@ -341,30 +332,6 @@ int IPACM_Config::Init(void)
 	rt_tbl_wan_dl.ip = IPA_IP_MAX;
 	strncpy(rt_tbl_wan_dl.name, WAN_DL_ROUTE_TABLE_NAME, sizeof(rt_tbl_wan_dl.name));
 
-	rt_tbl_lan2lan_v4.ip = IPA_IP_v4;
-	strncpy(rt_tbl_lan2lan_v4.name, V4_LAN_TO_LAN_ROUTE_TABLE_NAME, sizeof(rt_tbl_lan2lan_v4.name));
-
-	rt_tbl_lan2lan_v6.ip = IPA_IP_v6;
-	strncpy(rt_tbl_lan2lan_v6.name, V6_LAN_TO_LAN_ROUTE_TABLE_NAME, sizeof(rt_tbl_lan2lan_v6.name));
-
-	rt_tbl_eth_bridge_lan_lan_v4.ip = IPA_IP_v4;
-	strncpy(rt_tbl_eth_bridge_lan_lan_v4.name, ETH_BRIDGE_USB_CPE_ROUTE_TABLE_NAME_V4, sizeof(rt_tbl_eth_bridge_lan_lan_v4.name));
-
-	rt_tbl_eth_bridge_lan_wlan_v4.ip = IPA_IP_v4;
-	strncpy(rt_tbl_eth_bridge_lan_wlan_v4.name, ETH_BRIDGE_USB_WLAN_ROUTE_TABLE_NAME_V4, sizeof(rt_tbl_eth_bridge_lan_wlan_v4.name));
-
-	rt_tbl_eth_bridge_wlan_wlan_v4.ip = IPA_IP_v4;
-	strncpy(rt_tbl_eth_bridge_wlan_wlan_v4.name, ETH_BRIDGE_WLAN_WLAN_ROUTE_TABLE_NAME_V4, sizeof(rt_tbl_eth_bridge_wlan_wlan_v4.name));
-
-	rt_tbl_eth_bridge_lan_lan_v6.ip = IPA_IP_v6;
-	strncpy(rt_tbl_eth_bridge_lan_lan_v6.name, ETH_BRIDGE_USB_CPE_ROUTE_TABLE_NAME_V6, sizeof(rt_tbl_eth_bridge_lan_lan_v6.name));
-
-	rt_tbl_eth_bridge_lan_wlan_v6.ip = IPA_IP_v6;
-	strncpy(rt_tbl_eth_bridge_lan_wlan_v6.name, ETH_BRIDGE_USB_WLAN_ROUTE_TABLE_NAME_V6, sizeof(rt_tbl_eth_bridge_lan_wlan_v6.name));
-
-	rt_tbl_eth_bridge_wlan_wlan_v6.ip = IPA_IP_v6;
-	strncpy(rt_tbl_eth_bridge_wlan_wlan_v6.name, ETH_BRIDGE_WLAN_WLAN_ROUTE_TABLE_NAME_V6, sizeof(rt_tbl_eth_bridge_wlan_wlan_v6.name));
-
 	/* Construct IPACM ipa_client map to rm_resource table */
 	ipa_client_rm_map_tbl[IPA_CLIENT_WLAN1_PROD]= IPA_RM_RESOURCE_WLAN_PROD;
 	ipa_client_rm_map_tbl[IPA_CLIENT_USB_PROD]= IPA_RM_RESOURCE_USB_PROD;
@@ -844,7 +811,7 @@ const char* IPACM_Config::getEventName(ipa_cm_event_id event_id)
 {
 	if(event_id >= sizeof(ipacm_event_name)/sizeof(ipacm_event_name[0]))
 	{
-		IPACMDBG_DMESG("ERROR: Event name array is not consistent with event array!\n");
+		IPACMERR("Event name array is not consistent with event array!\n");
 		return NULL;
 	}