diff options
| author | LCPD Auto Merger <lcpd_integration@list.ti.com> | 2016-11-15 13:25:22 -0600 |
|---|---|---|
| committer | LCPD Auto Merger <lcpd_integration@list.ti.com> | 2016-11-15 13:25:22 -0600 |
| commit | b121b9789c92257b8f63e9862b1434baba1355c2 (patch) | |
| tree | 78aea421f27d169fe760a8c6b6d3a4d42a169a6c | |
| parent | a341d146d6498f077ab3aac5ba4109823bacb0aa (diff) | |
| parent | 656205f0410e79d24f982f97665e8952e3a87ac3 (diff) | |
| download | jacinto6evm-b121b9789c92257b8f63e9862b1434baba1355c2.tar.gz | |
Merge branch 'connectivity-ti-linux-4.4.y' of git://git.ti.com/connectivity-integration-tree/connectivity-ti-linux-kernel into ti-linux-4.4.yti2016.05-rc5-intti2016.05-rc4-intti2016.05-int
TI-Feature: connectivity
TI-Tree: git://git.ti.com/connectivity-integration-tree/connectivity-ti-linux-kernel.git
TI-Branch: connectivity-ti-linux-4.4.y
* 'connectivity-ti-linux-4.4.y' of git://git.ti.com/connectivity-integration-tree/connectivity-ti-linux-kernel:
ti_config_fragments/connectivity.cfg: enable CONFIG_IP_NF_NAT
Signed-off-by: LCPD Auto Merger <lcpd_integration@list.ti.com>
| -rw-r--r-- | ti_config_fragments/connectivity.cfg | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ti_config_fragments/connectivity.cfg b/ti_config_fragments/connectivity.cfg index 959c223c43bd..e4853308e3d3 100644 --- a/ti_config_fragments/connectivity.cfg +++ b/ti_config_fragments/connectivity.cfg @@ -52,6 +52,7 @@ CONFIG_IP_NF_ARPTABLES=m CONFIG_IP_NF_ARPFILTER=m CONFIG_IP_NF_ARP_MANGLE=m CONFIG_IP_NF_FILTER=m +CONFIG_IP_NF_NAT=m CONFIG_NF_NAT_IPV4=m CONFIG_IP_NF_TARGET_MASQUERADE=m CONFIG_BRIDGE=m |