Enable various new networking features

svn path=/dists/sid/linux/; revision=20150

debian/changelog

@@ -28,6 +28,11 @@ linux (3.9.4-1) UNRELEASED; urgency=low
     - [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.

debian/config/config

@@ -4268,6 +4268,7 @@ CONFIG_ATM_BR2684=m
 ##
 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_BT_RFCOMM_TTY=y
 ##
 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_SECMARK=m
 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
@@ -4693,6 +4697,11 @@ CONFIG_NFC=m
 ##
 # CONFIG_NFC_HCI is not set
 
+##
+## file: net/nfc/llcp/Kconfig
+##
+CONFIG_NFC_LLCP=y
+
 ##
 ## file: net/nfc/nci/Kconfig
 ##