diff options
| author | Ravi Gummadidala <rgummadi@codeaurora.org> | 2013-05-01 16:51:48 -0700 |
|---|---|---|
| committer | Ravi Gummadidala <rgummadi@codeaurora.org> | 2013-05-02 14:52:05 -0700 |
| commit | 371dbc47f9164f4895a9db97471bd0e8e070153e (patch) | |
| tree | 381f3078bee994dd636c6149c709ee907ce96ff8 /ipacm/src/IPACM_Iface.cpp | |
| parent | f1e2f790d4729cab7c412942953cedbe928999e8 (diff) | |
| download | ipacfg-mgr-371dbc47f9164f4895a9db97471bd0e8e070153e.tar.gz | |
Remove the hack in makefile, now IPACM will support dynamically
both WLAN has RX_prop or none
Change-Id: I15609b0f2939c6a7d457dad190fc220318fe51a2
Diffstat (limited to 'ipacm/src/IPACM_Iface.cpp')
| -rw-r--r-- | ipacm/src/IPACM_Iface.cpp | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/ipacm/src/IPACM_Iface.cpp b/ipacm/src/IPACM_Iface.cpp index 736c84a..d717007 100644 --- a/ipacm/src/IPACM_Iface.cpp +++ b/ipacm/src/IPACM_Iface.cpp @@ -519,11 +519,11 @@ int IPACM_Iface::init_fl_rule(ipa_ip_type iptype) int res = IPACM_SUCCESS, len = 0; struct ipa_flt_rule_add flt_rule_entry; ipa_ioc_add_flt_rule *m_pFilteringTable; -#ifdef WLAN_SW_RX - /* Adding this hack because WLAN may not registered for Rx-endpoint, other ifaces will always have*/ + /* Adding this hack because WLAN may not registered for Rx-endpoint, other ifaces will always have*/ char *dev_wlan0="wlan0"; char *dev_wlan1="wlan1"; -#endif + char *dev_ecm0="ecm0"; + /* update the iface ip-type to be IPA_IP_v4, IPA_IP_v6 or both*/ if (iptype == IPA_IP_v4) { @@ -567,23 +567,26 @@ int IPACM_Iface::init_fl_rule(ipa_ip_type iptype) } /* ADD corresponding ipa_rm_resource_name of RX-endpoint before adding all IPV4V6 FT-rules */ -#ifdef WLAN_SW_RX - if(strcmp(dev_name,dev_wlan0) == 0 || strcmp(dev_name,dev_wlan1) == 0) + if(rx_prop != NULL) { - /* dev_name == dev2 (wlan0)*/ - IPACMDBG(" work-around setup iface %s rx property\n", dev_wlan0); - IPACM_Iface::ipacmcfg->AddRmDepend(IPA_RM_RESOURCE_HSIC_PROD); + IPACM_Iface::ipacmcfg->AddRmDepend(IPACM_Iface::ipacmcfg->ipa_client_rm_map_tbl[rx_prop->rx[0].src_pipe],false); + IPACMDBG(" add producer dependency from %s with registered rx-prop\n", dev_name); } else { - if(rx_prop != NULL) + /* only wlan may take software-path, not register Rx-property*/ + if(strcmp(dev_name,dev_wlan0) == 0 || strcmp(dev_name,dev_wlan1) == 0) { - IPACM_Iface::ipacmcfg->AddRmDepend(IPACM_Iface::ipacmcfg->ipa_client_rm_map_tbl[rx_prop->rx[0].src_pipe]); + IPACM_Iface::ipacmcfg->AddRmDepend(IPA_RM_RESOURCE_HSIC_PROD,true); + IPACMDBG(" add producer dependency from %s without registered rx-prop \n", dev_name); + } + + if(strcmp(dev_name,dev_ecm0) == 0) + { + IPACM_Iface::ipacmcfg->AddRmDepend(IPA_RM_RESOURCE_USB_PROD,true); + IPACMDBG(" add producer dependency from %s without registered rx-prop \n", dev_name); } } -#else - IPACM_Iface::ipacmcfg->AddRmDepend(IPACM_Iface::ipacmcfg->ipa_client_rm_map_tbl[rx_prop->rx[0].src_pipe]); -#endif if (rx_prop == NULL) { |