[kernel] r20150 - in dists/sid/linux/debian: . config

[Ben Hutchings]

Author: benh
Date: Fri May 31 02:36:04 2013
New Revision: 20150

Log:
Enable various new networking features

Modified:
   dists/sid/linux/debian/changelog
   dists/sid/linux/debian/config/config

Modified: dists/sid/linux/debian/changelog
==============================================================================
--- dists/sid/linux/debian/changelog	Thu May 30 09:45:43 2013	(r20149)
+++ dists/sid/linux/debian/changelog	Fri May 31 02:36:04 2013	(r20150)
@@ -28,6 +28,11 @@
     - [powerpcspe] Add llc to nic-shared-modules (Closes: #708662)
     - [powerpc/powerpc64] Replace ibmvscsic with ibmvscsi in scsi-modules
     - [ppc64] Use symlinks to follow powerpc/powerpc64 configuration
+  * netfilter: Enable NETFILTER_XT_MATCH_BPF, NETFILTER_XT_MATCH_CONNLABEL
+    as modules
+  * bridge: Enable BRIDGE_VLAN_FILTERING
+  * batman: Enable BATMAN_ADV_DAT
+  * nfc: Enable NFC_LLCP
 
   [ Aurelien Jarno ]
   * [mips] Enable KEXEC.

Modified: dists/sid/linux/debian/config/config
==============================================================================
--- dists/sid/linux/debian/config/config	Thu May 30 09:45:43 2013	(r20149)
+++ dists/sid/linux/debian/config/config	Fri May 31 02:36:04 2013	(r20150)
@@ -4268,6 +4268,7 @@
 ##
 CONFIG_BATMAN_ADV=m
 CONFIG_BATMAN_ADV_BLA=y
+CONFIG_BATMAN_ADV_DAT=y
 # CONFIG_BATMAN_ADV_DEBUG is not set
 
 ##
@@ -4303,6 +4304,7 @@
 ##
 CONFIG_BRIDGE=m
 CONFIG_BRIDGE_IGMP_SNOOPING=y
+CONFIG_BRIDGE_VLAN_FILTERING=y
 
 ##
 ## file: net/bridge/netfilter/Kconfig
@@ -4596,9 +4598,11 @@
 CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
 CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
 CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
+CONFIG_NETFILTER_XT_MATCH_BPF=m
 CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
 CONFIG_NETFILTER_XT_MATCH_COMMENT=m
 CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
+CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m
 CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
 CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
 CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
@@ -4694,6 +4698,11 @@
 # CONFIG_NFC_HCI is not set
 
 ##
+## file: net/nfc/llcp/Kconfig
+##
+CONFIG_NFC_LLCP=y
+
+##
 ## file: net/nfc/nci/Kconfig
 ##
 CONFIG_NFC_NCI=m