git.openwrt.org Git - openwrt/staging/blocktrron.git/blob

   1 From 04d0864c81c030789c96b353909d2d89559c904d Mon Sep 17 00:00:00 2001
   2 From: Phil Elwell <phil@raspberrypi.org>
   3 Date: Sun, 24 Mar 2019 20:54:25 +0000
   4 Subject: [PATCH 381/782] configs: Re-enable CONFIG_NETFILTER_XT_MATCH_SOCKET
   5
   6 A Kconfig change in 4.10 caused the xt_socket module to no-longer be
   7 included in Raspbian builds. Fix the defconfigs to re-enable it.
   8
   9 See: https://github.com/raspberrypi/linux/issues/2905
  10
  11 Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  12 ---
  13  arch/arm/configs/bcm2709_defconfig   | 1 +
  14  arch/arm/configs/bcmrpi_defconfig    | 1 +
  15  arch/arm64/configs/bcmrpi3_defconfig | 1 +
  16  3 files changed, 3 insertions(+)
  17
  18 --- a/arch/arm/configs/bcm2709_defconfig
  19 +++ b/arch/arm/configs/bcm2709_defconfig
  20 @@ -186,6 +186,7 @@ CONFIG_NETFILTER_XT_MATCH_QUOTA=m
  21  CONFIG_NETFILTER_XT_MATCH_RATEEST=m
  22  CONFIG_NETFILTER_XT_MATCH_REALM=m
  23  CONFIG_NETFILTER_XT_MATCH_RECENT=m
  24 +CONFIG_NETFILTER_XT_MATCH_SOCKET=m
  25  CONFIG_NETFILTER_XT_MATCH_STATE=m
  26  CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
  27  CONFIG_NETFILTER_XT_MATCH_STRING=m
  28 --- a/arch/arm/configs/bcmrpi_defconfig
  29 +++ b/arch/arm/configs/bcmrpi_defconfig
  30 @@ -180,6 +180,7 @@ CONFIG_NETFILTER_XT_MATCH_QUOTA=m
  31  CONFIG_NETFILTER_XT_MATCH_RATEEST=m
  32  CONFIG_NETFILTER_XT_MATCH_REALM=m
  33  CONFIG_NETFILTER_XT_MATCH_RECENT=m
  34 +CONFIG_NETFILTER_XT_MATCH_SOCKET=m
  35  CONFIG_NETFILTER_XT_MATCH_STATE=m
  36  CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
  37  CONFIG_NETFILTER_XT_MATCH_STRING=m
  38 --- a/arch/arm64/configs/bcmrpi3_defconfig
  39 +++ b/arch/arm64/configs/bcmrpi3_defconfig
  40 @@ -181,6 +181,7 @@ CONFIG_NETFILTER_XT_MATCH_QUOTA=m
  41  CONFIG_NETFILTER_XT_MATCH_RATEEST=m
  42  CONFIG_NETFILTER_XT_MATCH_REALM=m
  43  CONFIG_NETFILTER_XT_MATCH_RECENT=m
  44 +CONFIG_NETFILTER_XT_MATCH_SOCKET=m
  45  CONFIG_NETFILTER_XT_MATCH_STATE=m
  46  CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
  47  CONFIG_NETFILTER_XT_MATCH_STRING=m