diff options
| author | Skylar Chang <chiaweic@codeaurora.org> | 2015-02-24 21:08:54 -0800 |
|---|---|---|
| committer | Skylar Chang <chiaweic@codeaurora.org> | 2015-02-25 17:39:34 -0800 |
| commit | 864f9dac52d4a547e06b5b369941e5bb4195babd (patch) | |
| tree | 745d32605bb9f3ad93fa27ba8956ce3e92256f9e /ipacm/src/IPACM_Config.cpp | |
| parent | f18c791de2966cc0bc3ca36ccfa80da7a8d58931 (diff) | |
| download | ipacfg-mgr-864f9dac52d4a547e06b5b369941e5bb4195babd.tar.gz | |
IPACM: support CPE<->WLAN through Ethernet Bridging data path
Previously IPACM supports only USB<->WLAN and WLAN<->WLAN through
Ethernet Bridging, now we add a new header processing context for
WLAN->CPE and adjust the logic in maintaining header processing
context to support CPE<->WLAN data path also.
Change-Id: I9db8d6c7cfefaa28b8588c945ccbf04f1d2996d2
Diffstat (limited to 'ipacm/src/IPACM_Config.cpp')
| -rw-r--r-- | ipacm/src/IPACM_Config.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ipacm/src/IPACM_Config.cpp b/ipacm/src/IPACM_Config.cpp index 7ed3ade..0bd47ce 100644 --- a/ipacm/src/IPACM_Config.cpp +++ b/ipacm/src/IPACM_Config.cpp @@ -78,9 +78,9 @@ 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_usb_wlan_v4, 0, sizeof(rt_tbl_eth_bridge_usb_wlan_v4)); + 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_usb_wlan_v6, 0, sizeof(rt_tbl_eth_bridge_usb_wlan_v6)); + 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; @@ -267,14 +267,14 @@ int IPACM_Config::Init(void) 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_usb_wlan_v4.ip = IPA_IP_v4; - strncpy(rt_tbl_eth_bridge_usb_wlan_v4.name, ETH_BRIDGE_USB_WLAN_ROUTE_TABLE_NAME_V4, sizeof(rt_tbl_eth_bridge_usb_wlan_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_usb_wlan_v6.ip = IPA_IP_v6; - strncpy(rt_tbl_eth_bridge_usb_wlan_v6.name, ETH_BRIDGE_USB_WLAN_ROUTE_TABLE_NAME_V6, sizeof(rt_tbl_eth_bridge_usb_wlan_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)); |