Enable various new networking features

svn path=/dists/sid/linux/; revision=20150
This commit is contained in:
Ben Hutchings 2013-05-31 02:36:04 +00:00
parent 8e28f834dd
commit eee044f3b9
2 changed files with 14 additions and 0 deletions

5
debian/changelog vendored
View File

@ -28,6 +28,11 @@ linux (3.9.4-1) UNRELEASED; urgency=low
- [powerpcspe] Add llc to nic-shared-modules (Closes: #708662) - [powerpcspe] Add llc to nic-shared-modules (Closes: #708662)
- [powerpc/powerpc64] Replace ibmvscsic with ibmvscsi in scsi-modules - [powerpc/powerpc64] Replace ibmvscsic with ibmvscsi in scsi-modules
- [ppc64] Use symlinks to follow powerpc/powerpc64 configuration - [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 ] [ Aurelien Jarno ]
* [mips] Enable KEXEC. * [mips] Enable KEXEC.

View File

@ -4268,6 +4268,7 @@ CONFIG_ATM_BR2684=m
## ##
CONFIG_BATMAN_ADV=m CONFIG_BATMAN_ADV=m
CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_BLA=y
CONFIG_BATMAN_ADV_DAT=y
# CONFIG_BATMAN_ADV_DEBUG is not set # CONFIG_BATMAN_ADV_DEBUG is not set
## ##
@ -4303,6 +4304,7 @@ CONFIG_BT_RFCOMM_TTY=y
## ##
CONFIG_BRIDGE=m CONFIG_BRIDGE=m
CONFIG_BRIDGE_IGMP_SNOOPING=y CONFIG_BRIDGE_IGMP_SNOOPING=y
CONFIG_BRIDGE_VLAN_FILTERING=y
## ##
## file: net/bridge/netfilter/Kconfig ## 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_TCPMSS=m
CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
CONFIG_NETFILTER_XT_MATCH_BPF=m
CONFIG_NETFILTER_XT_MATCH_CLUSTER=m CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
CONFIG_NETFILTER_XT_MATCH_COMMENT=m CONFIG_NETFILTER_XT_MATCH_COMMENT=m
CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m
CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
CONFIG_NETFILTER_XT_MATCH_CONNMARK=m CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
@ -4693,6 +4697,11 @@ CONFIG_NFC=m
## ##
# CONFIG_NFC_HCI is not set # CONFIG_NFC_HCI is not set
##
## file: net/nfc/llcp/Kconfig
##
CONFIG_NFC_LLCP=y
## ##
## file: net/nfc/nci/Kconfig ## file: net/nfc/nci/Kconfig
## ##