From aaf283eaea37a5f8b29f35c8e5963f128ce6a98c Mon Sep 17 00:00:00 2001
From: Pau Espin Pedrol <pespin@sysmocom.de>
Date: Thu, 5 Oct 2017 17:36:02 +0200
Subject: [PATCH] linux: sysmocom-apu2: Enable defconfig
 CONFIG_IP_NF_TARGET_MASQUERADE

After switch to linux 4.9.14, make oldconfig run by OE was disabling
CONFIG_IP_NF_TARGET_MASQUERADE even if original defconfig had it enabled
as a module. This target is required for osmo-ggsn.
---
 recipes-bsp/linux/files/sysmocom-bsc/defconfig | 16 +++++++++++-----
 recipes-bsp/linux/linux-sysmocom_4.9.bb        |  2 +-
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/recipes-bsp/linux/files/sysmocom-bsc/defconfig b/recipes-bsp/linux/files/sysmocom-bsc/defconfig
index 62a5d5d..40df95f 100644
--- a/recipes-bsp/linux/files/sysmocom-bsc/defconfig
+++ b/recipes-bsp/linux/files/sysmocom-bsc/defconfig
@@ -833,7 +833,7 @@ CONFIG_NETFILTER_XT_TARGET_HL=m
 # CONFIG_NETFILTER_XT_TARGET_LED is not set
 CONFIG_NETFILTER_XT_TARGET_LOG=m
 CONFIG_NETFILTER_XT_TARGET_MARK=m
-# CONFIG_NETFILTER_XT_NAT is not set
+CONFIG_NETFILTER_XT_NAT=m
 CONFIG_NETFILTER_XT_TARGET_NETMAP=m
 CONFIG_NETFILTER_XT_TARGET_NFLOG=m
 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
@@ -923,7 +923,7 @@ CONFIG_NF_DUP_IPV4=m
 CONFIG_NF_LOG_IPV4=m
 CONFIG_NF_REJECT_IPV4=m
 CONFIG_NF_NAT_IPV4=m
-# CONFIG_NF_NAT_MASQUERADE_IPV4 is not set
+CONFIG_NF_NAT_MASQUERADE_IPV4=m
 CONFIG_NF_NAT_SNMP_BASIC=m
 CONFIG_NF_NAT_PROTO_GRE=m
 CONFIG_NF_NAT_PPTP=m
@@ -936,7 +936,10 @@ CONFIG_IP_NF_MATCH_TTL=m
 CONFIG_IP_NF_FILTER=m
 CONFIG_IP_NF_TARGET_REJECT=m
 # CONFIG_IP_NF_TARGET_SYNPROXY is not set
-# CONFIG_IP_NF_NAT is not set
+CONFIG_IP_NF_NAT=m
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+# CONFIG_IP_NF_TARGET_NETMAP is not set
+# CONFIG_IP_NF_TARGET_REDIRECT is not set
 CONFIG_IP_NF_MANGLE=m
 CONFIG_IP_NF_TARGET_CLUSTERIP=m
 CONFIG_IP_NF_TARGET_ECN=m
@@ -955,7 +958,8 @@ CONFIG_NF_CONNTRACK_IPV6=m
 CONFIG_NF_DUP_IPV6=m
 CONFIG_NF_REJECT_IPV6=m
 CONFIG_NF_LOG_IPV6=m
-# CONFIG_NF_NAT_IPV6 is not set
+CONFIG_NF_NAT_IPV6=m
+CONFIG_NF_NAT_MASQUERADE_IPV6=m
 CONFIG_IP6_NF_IPTABLES=m
 CONFIG_IP6_NF_MATCH_AH=m
 CONFIG_IP6_NF_MATCH_EUI64=m
@@ -973,7 +977,9 @@ CONFIG_IP6_NF_TARGET_REJECT=m
 CONFIG_IP6_NF_MANGLE=m
 CONFIG_IP6_NF_RAW=m
 # CONFIG_IP6_NF_SECURITY is not set
-# CONFIG_IP6_NF_NAT is not set
+CONFIG_IP6_NF_NAT=m
+CONFIG_IP6_NF_TARGET_MASQUERADE=m
+# CONFIG_IP6_NF_TARGET_NPT is not set
 CONFIG_BRIDGE_NF_EBTABLES=m
 CONFIG_BRIDGE_EBT_BROUTE=m
 CONFIG_BRIDGE_EBT_T_FILTER=m
diff --git a/recipes-bsp/linux/linux-sysmocom_4.9.bb b/recipes-bsp/linux/linux-sysmocom_4.9.bb
index 84d1cd4..4e74528 100644
--- a/recipes-bsp/linux/linux-sysmocom_4.9.bb
+++ b/recipes-bsp/linux/linux-sysmocom_4.9.bb
@@ -15,7 +15,7 @@ BTS_FIRMWARE_NAME_sysmobts-v2 = "sysmobts-v2"
 
 SRCREV = "8d5d275254642b70b3ecf18a5b9b9fe9d5777230"
 
-PR = "r2"
+PR = "r3"
 PV = "${LINUX_VERSION}+git${SRCPV}"
 
 SRC_URI = "git://git.sysmocom.de/sysmo-bts/linux.git;protocol=git;branch=lynxis/v4.9 \