From 5b1ebe6a26c4df30052c9c1208c663779d4f619f Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Fri, 21 Mar 2014 16:09:52 +0100 Subject: [PATCH] linux-sysmocom: Local hacks to have NAT/MASQ on 3.2 and 3.10 kernels The name/structure of the NAT configuration was changed. Catch up and put the new names into the old defconfig too. It is an ugly hack to have it work with v3.2 and v3.10 kernels. The sysmobsc has been fixed independently. --- recipes-bsp/linux/files/sysmobts-2050/defconfig | 13 +++++++++++++ recipes-bsp/linux/files/sysmobts-v1/defconfig | 13 +++++++++++++ recipes-bsp/linux/files/sysmobts-v2/defconfig | 13 +++++++++++++ recipes-bsp/linux/linux-sysmocom_git.bb | 2 +- 4 files changed, 40 insertions(+), 1 deletion(-) diff --git a/recipes-bsp/linux/files/sysmobts-2050/defconfig b/recipes-bsp/linux/files/sysmobts-2050/defconfig index 6d8712c..672a4d2 100644 --- a/recipes-bsp/linux/files/sysmobts-2050/defconfig +++ b/recipes-bsp/linux/files/sysmobts-2050/defconfig @@ -503,6 +503,19 @@ CONFIG_NF_CONNTRACK_FTP=m CONFIG_NF_CONNTRACK_SIP=m # CONFIG_NF_CONNTRACK_TFTP is not set CONFIG_NF_CT_NETLINK=m +CONFIG_NF_NAT=m +CONFIG_NF_NAT_IPV4=m +CONFIG_IP_NF_TARGET_MASQUERADE=m +CONFIG_IP_NF_TARGET_NETMAP=m +CONFIG_IP_NF_TARGET_REDIRECT=m +CONFIG_NF_NAT_PROTO_DCCP=m +CONFIG_NF_NAT_PROTO_UDPLITE=m +CONFIG_NF_NAT_PROTO_SCTP=m +# CONFIG_NF_NAT_AMANDA is not set +CONFIG_NF_NAT_FTP=m +# CONFIG_NF_NAT_IRC is not set +CONFIG_NF_NAT_SIP=m +# CONFIG_NF_NAT_TFTP is not set # CONFIG_NETFILTER_TPROXY is not set CONFIG_NETFILTER_XTABLES=m diff --git a/recipes-bsp/linux/files/sysmobts-v1/defconfig b/recipes-bsp/linux/files/sysmobts-v1/defconfig index c632b7c..444cec4 100644 --- a/recipes-bsp/linux/files/sysmobts-v1/defconfig +++ b/recipes-bsp/linux/files/sysmobts-v1/defconfig @@ -511,6 +511,19 @@ CONFIG_NF_CONNTRACK_FTP=m CONFIG_NF_CONNTRACK_SIP=m # CONFIG_NF_CONNTRACK_TFTP is not set CONFIG_NF_CT_NETLINK=m +CONFIG_NF_NAT=m +CONFIG_NF_NAT_IPV4=m +CONFIG_IP_NF_TARGET_MASQUERADE=m +CONFIG_IP_NF_TARGET_NETMAP=m +CONFIG_IP_NF_TARGET_REDIRECT=m +CONFIG_NF_NAT_PROTO_DCCP=m +CONFIG_NF_NAT_PROTO_UDPLITE=m +CONFIG_NF_NAT_PROTO_SCTP=m +# CONFIG_NF_NAT_AMANDA is not set +CONFIG_NF_NAT_FTP=m +# CONFIG_NF_NAT_IRC is not set +CONFIG_NF_NAT_SIP=m +# CONFIG_NF_NAT_TFTP is not set # CONFIG_NETFILTER_TPROXY is not set CONFIG_NETFILTER_XTABLES=m diff --git a/recipes-bsp/linux/files/sysmobts-v2/defconfig b/recipes-bsp/linux/files/sysmobts-v2/defconfig index a4109aa..436f3d2 100644 --- a/recipes-bsp/linux/files/sysmobts-v2/defconfig +++ b/recipes-bsp/linux/files/sysmobts-v2/defconfig @@ -516,6 +516,19 @@ CONFIG_NF_CONNTRACK_FTP=m CONFIG_NF_CONNTRACK_SIP=m # CONFIG_NF_CONNTRACK_TFTP is not set CONFIG_NF_CT_NETLINK=m +CONFIG_NF_NAT=m +CONFIG_NF_NAT_IPV4=m +CONFIG_IP_NF_TARGET_MASQUERADE=m +CONFIG_IP_NF_TARGET_NETMAP=m +CONFIG_IP_NF_TARGET_REDIRECT=m +CONFIG_NF_NAT_PROTO_DCCP=m +CONFIG_NF_NAT_PROTO_UDPLITE=m +CONFIG_NF_NAT_PROTO_SCTP=m +# CONFIG_NF_NAT_AMANDA is not set +CONFIG_NF_NAT_FTP=m +# CONFIG_NF_NAT_IRC is not set +CONFIG_NF_NAT_SIP=m +# CONFIG_NF_NAT_TFTP is not set # CONFIG_NETFILTER_TPROXY is not set CONFIG_NETFILTER_XTABLES=m diff --git a/recipes-bsp/linux/linux-sysmocom_git.bb b/recipes-bsp/linux/linux-sysmocom_git.bb index beb4d20..dc5ed16 100644 --- a/recipes-bsp/linux/linux-sysmocom_git.bb +++ b/recipes-bsp/linux/linux-sysmocom_git.bb @@ -14,7 +14,7 @@ BTS_FIRMWARE_NAME_sysmobts-2050 = "sysmobts-v2" SRCREV = "ad70d9a96e62bcdbc184512ae375d5d9b5d318d4" -PR = "r31.3" +PR = "r31.4" PV = "${LINUX_VERSION}+git${SRCPV}" SRC_URI = "git://git.sysmocom.de/sysmo-bts/linux.git;protocol=git;branch=v3.10 \