From 8144eb14090b0caeef480d7e86b0e0337e4aaed2 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <benh@debian.org>
Date: Fri, 28 Mar 2014 00:22:33 +0000
Subject: [PATCH] nftables: Enable various layer 3 protocol modules (Closes:
 #742763)

svn path=/dists/trunk/linux/; revision=21196
---
 debian/changelog     | 5 +++++
 debian/config/config | 8 ++++++++
 2 files changed, 13 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 7ff243189..66295155e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,11 @@ linux (3.14~rc8-1~exp1) UNRELEASED; urgency=medium
 
   * New upstream release candidate
 
+  [ Ben Hutchings ]
+  * nftables: Enable NF_TABLES_BRIDGE, NF_TABLES_IPV4, NFT_CHAIN_ROUTE_IPV4,
+    NFT_CHAIN_NAT_IPV4, NF_TABLES_ARP, NF_TABLES_IPV6, NFT_CHAIN_ROUTE_IPV6,
+    NFT_CHAIN_NAT_IPV6 as modules (Closes: #742763)
+
  -- Ben Hutchings <ben@decadent.org.uk>  Wed, 26 Mar 2014 13:31:44 +0000
 
 linux (3.14~rc7-1~exp1) experimental; urgency=medium
diff --git a/debian/config/config b/debian/config/config
index 87471504e..83b500d79 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -5029,6 +5029,7 @@ CONFIG_BRIDGE_VLAN_FILTERING=y
 ##
 ## file: net/bridge/netfilter/Kconfig
 ##
+CONFIG_NF_TABLES_BRIDGE=m
 CONFIG_BRIDGE_NF_EBTABLES=m
 CONFIG_BRIDGE_EBT_BROUTE=m
 CONFIG_BRIDGE_EBT_T_FILTER=m
@@ -5170,6 +5171,10 @@ CONFIG_TCP_MD5SIG=y
 ##
 CONFIG_NF_CONNTRACK_IPV4=m
 CONFIG_NF_CONNTRACK_PROC_COMPAT=y
+CONFIG_NF_TABLES_IPV4=m
+CONFIG_NFT_CHAIN_ROUTE_IPV4=m
+CONFIG_NFT_CHAIN_NAT_IPV4=m
+CONFIG_NF_TABLES_ARP=m
 CONFIG_IP_NF_IPTABLES=m
 CONFIG_IP_NF_MATCH_AH=m
 CONFIG_IP_NF_MATCH_RPFILTER=m
@@ -5220,6 +5225,9 @@ CONFIG_IPV6_PIMSM_V2=y
 ## file: net/ipv6/netfilter/Kconfig
 ##
 CONFIG_NF_CONNTRACK_IPV6=m
+CONFIG_NF_TABLES_IPV6=m
+CONFIG_NFT_CHAIN_ROUTE_IPV6=m
+CONFIG_NFT_CHAIN_NAT_IPV6=m
 CONFIG_IP6_NF_IPTABLES=m
 CONFIG_IP6_NF_MATCH_AH=m
 CONFIG_IP6_NF_MATCH_EUI64=m