merge netfilter changes to 2.6.27

[openwrt.git] / target / linux / generic-2.6 / config-2.6.27

diff --git a/target/linux/generic-2.6/config-2.6.27 b/target/linux/generic-2.6/config-2.6.27
index 5a62a2f..90c1668 100644 (file)
--- a/target/linux/generic-2.6/config-2.6.27
+++ b/target/linux/generic-2.6/config-2.6.27
@@ -7,6 +7,7 @@
 # CONFIG_ADAPTEC_STARFIRE is not set
 # CONFIG_ADFS_FS is not set
 # CONFIG_ADM6996_PHY is not set
+# CONFIG_ADM8211 is not set
 # CONFIG_AFFS_FS is not set
 # CONFIG_AFS_FS is not set
 # CONFIG_AF_RXRPC is not set
@@ -29,6 +30,8 @@ CONFIG_ASK_IP_FIB_HASH=y
 # CONFIG_ATA_GENERIC is not set
 # CONFIG_ATA_OVER_ETH is not set
 # CONFIG_ATA_SFF is not set
+# CONFIG_ATH5K is not set
+# CONFIG_ATH9K is not set
 # CONFIG_ATL1 is not set
 # CONFIG_ATL1E is not set
 CONFIG_ATM=m
@@ -60,6 +63,8 @@ CONFIG_ATM_TCP=m
 CONFIG_AX25=m
 # CONFIG_AX25_DAMA_SLAVE is not set
 # CONFIG_AX88796 is not set
+# CONFIG_B43 is not set
+# CONFIG_B43LEGACY is not set
 # CONFIG_B44 is not set
 # CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 CONFIG_BASE_FULL=y
@@ -176,6 +181,7 @@ CONFIG_BRIDGE_EBT_ULOG=m
 CONFIG_BRIDGE_EBT_VLAN=m
 # CONFIG_BRIDGE_NETFILTER is not set
 CONFIG_BRIDGE_NF_EBTABLES=m
+# CONFIG_BROADCOM_PHY is not set
 CONFIG_BROKEN_ON_SMP=y
 CONFIG_BSD_DISKLABEL=y
 CONFIG_BSD_PROCESS_ACCT=y
@@ -217,7 +223,7 @@ CONFIG_CARDBUS=y
 # CONFIG_CASSINI is not set
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 # CONFIG_CDROM_PKTCDVD is not set
-# CONFIG_CFG80211 is not set
+CONFIG_CFG80211=m
 # CONFIG_CGROUPS is not set
 # CONFIG_CHELSIO_T1 is not set
 # CONFIG_CHELSIO_T3 is not set
@@ -405,11 +411,14 @@ CONFIG_GENERIC_IRQ_PROBE=y
 CONFIG_GENERIC_TIME=y
 # CONFIG_GFS2_FS is not set
 CONFIG_GPIO_DEVICE=m
+# CONFIG_GPIO_MAX7301 is not set
+# CONFIG_GPIO_MAX732X is not set
 # CONFIG_GPIO_MCP23S08 is not set
 # CONFIG_GPIO_PCA953X is not set
 # CONFIG_GPIO_PCF857X is not set
 # CONFIG_GPIO_SYSFS is not set
 # CONFIG_GPIOLIB is not set
+# CONFIG_GPIO_BT8XX is not set
 # CONFIG_GROUP_SCHED is not set
 # CONFIG_HAMACHI is not set
 CONFIG_HAMRADIO=y
@@ -731,6 +740,9 @@ CONFIG_ISDN_CAPI_MIDDLEWARE=y
 # CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON is not set
 # CONFIG_ISDN_I4L is not set
 CONFIG_ISO9660_FS=m
+# CONFIG_IWL3945 is not set
+# CONFIG_IWLAGN is not set
+# CONFIG_IWLCORE is not set
 # CONFIG_IWLWIFI_LEDS is not set
 # CONFIG_IXGB is not set
 CONFIG_JBD=m
@@ -794,9 +806,16 @@ CONFIG_LOCKD_V4=y
 CONFIG_LOG_BUF_SHIFT=14
 # CONFIG_LSF is not set
 # CONFIG_LXT_PHY is not set
-# CONFIG_MAC80211 is not set
+CONFIG_MAC80211=m
 # CONFIG_MAC80211_DEBUG is not set
+# CONFIG_MAC80211_DEBUGFS is not set
+# CONFIG_MAC80211_DEBUG_MENU is not set
+# CONFIG_MAC80211_HWSIM is not set
 # CONFIG_MAC80211_LEDS is not set
+# CONFIG_MAC80211_MESH is not set
+CONFIG_MAC80211_RC_DEFAULT="pid"
+CONFIG_MAC80211_RC_DEFAULT_PID=y
+CONFIG_MAC80211_RC_PID=y
 # CONFIG_MACVLAN is not set
 # CONFIG_MAC_EMUMOUSEBTN is not set
 CONFIG_MAC_PARTITION=y
@@ -805,6 +824,7 @@ CONFIG_MAC_PARTITION=y
 # CONFIG_MARKERS is not set
 # CONFIG_MARVELL_PHY is not set
 # CONFIG_MD is not set
+# CONFIG_MDIO_BITBANG is not set
 # CONFIG_MEDIA_ATTACH is not set
 # CONFIG_MEDIA_TUNER_CUSTOMIZE is not set
 # CONFIG_MEGARAID_LEGACY is not set
@@ -820,6 +840,7 @@ CONFIG_MINIX_FS=m
 CONFIG_MINI_FO=y
 CONFIG_MISC_DEVICES=y
 # CONFIG_MISDN is not set
+# CONFIG_MISDN_HFCPCI is not set
 CONFIG_MKISS=m
 # CONFIG_MMC is not set
 # CONFIG_MMC_ARMMMCI is not set
@@ -895,7 +916,6 @@ CONFIG_NETFILTER_XT_MATCH_OWNER=m
 CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
 CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
 CONFIG_NETFILTER_XT_MATCH_POLICY=m
-CONFIG_NETFILTER_XT_MATCH_PORTSCAN=m
 # CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
 CONFIG_NETFILTER_XT_MATCH_RATEEST=m
 CONFIG_NETFILTER_XT_MATCH_REALM=m
@@ -906,17 +926,14 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m
 CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
 CONFIG_NETFILTER_XT_MATCH_TIME=m
 CONFIG_NETFILTER_XT_MATCH_U32=m
-CONFIG_NETFILTER_XT_TARGET_CHAOS=m
 CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
 CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
-CONFIG_NETFILTER_XT_TARGET_DELUDE=m
 CONFIG_NETFILTER_XT_TARGET_DSCP=m
 CONFIG_NETFILTER_XT_TARGET_MARK=m
 CONFIG_NETFILTER_XT_TARGET_NFLOG=m
 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
 CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
 CONFIG_NETFILTER_XT_TARGET_RATEEST=m
-CONFIG_NETFILTER_XT_TARGET_TARPIT=m
 CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
 CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
 CONFIG_NETFILTER_XT_TARGET_TRACE=m
@@ -1045,6 +1062,7 @@ CONFIG_NF_NAT_RTSP=m
 CONFIG_NF_NAT_SIP=m
 CONFIG_NF_NAT_SNMP_BASIC=m
 CONFIG_NF_NAT_TFTP=m
+CONFIG_NL80211=y
 CONFIG_NLS=m
 # CONFIG_NLS_ASCII is not set
 CONFIG_NLS_CODEPAGE_1250=m
@@ -1094,6 +1112,7 @@ CONFIG_NORTEL_HERMES=m
 # CONFIG_NTFS_RW is not set
 # CONFIG_OCFS2_FS is not set
 # CONFIG_OCF_BENCH is not set
+# CONFIG_OCF_EP80579 is not set
 # CONFIG_OCF_HIFN is not set
 # CONFIG_OCF_HIFNHIPP is not set
 # CONFIG_OCF_IXP4XX is not set
@@ -1103,6 +1122,7 @@ CONFIG_NORTEL_HERMES=m
 # CONFIG_OCF_TALITOS is not set
 # CONFIG_OMFS_FS is not set
 # CONFIG_OSF_PARTITION is not set
+# CONFIG_P54_COMMON is not set
 CONFIG_PACKET=y
 CONFIG_PACKET_MMAP=y
 # CONFIG_PARPORT is not set
@@ -1216,6 +1236,7 @@ CONFIG_PROC_SYSCTL=y
 # CONFIG_QEMU is not set
 # CONFIG_QLA3XXX is not set
 # CONFIG_QNX4FS_FS is not set
+# CONFIG_QSEMI_PHY is not set
 # CONFIG_QUOTA is not set
 # CONFIG_R3964 is not set
 # CONFIG_R8169 is not set
@@ -1237,6 +1258,7 @@ CONFIG_PROC_SYSCTL=y
 # CONFIG_RAID_ATTRS is not set
 CONFIG_RAMFS=y
 # CONFIG_RAW_DRIVER is not set
+# CONFIG_REALTEK_PHY is not set
 # CONFIG_REGULATOR is not set
 # CONFIG_REGULATOR_BQ24022 is not set
 # CONFIG_REGULATOR_FIXED_VOLTAGE is not set
@@ -1254,6 +1276,7 @@ CONFIG_RFKILL=m
 # CONFIG_ROSE is not set
 CONFIG_RPCSEC_GSS_KRB5=m
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
+# CONFIG_RT2X00 is not set
 # CONFIG_RTC_CLASS is not set
 CONFIG_RTC_DRV_CMOS=y
 # CONFIG_RTC_DRV_DS1511 is not set
@@ -1263,6 +1286,7 @@ CONFIG_RTC_DRV_CMOS=y
 # CONFIG_RTC_DRV_R9701 is not set
 # CONFIG_RTC_DRV_RS5C348 is not set
 # CONFIG_RTC_DRV_S35390A is not set
+# CONFIG_RTL8180 is not set
 # CONFIG_RTL8187 is not set
 CONFIG_RT_MUTEXES=y
 # CONFIG_S2IO is not set
@@ -1449,6 +1473,7 @@ CONFIG_SIGNALFD=y
 # CONFIG_SK98LIN is not set
 # CONFIG_SKGE is not set
 # CONFIG_SKY2 is not set
+# CONFIG_SKY2_DEBUG is not set
 CONFIG_SLAB=y
 CONFIG_SLABINFO=y
 CONFIG_SLHC=m
@@ -1458,6 +1483,7 @@ CONFIG_SLHC=m
 # CONFIG_SLUB_DEBUG is not set
 # CONFIG_SMB_FS is not set
 # CONFIG_SMB_NLS_DEFAULT is not set
+# CONFIG_SMSC_PHY is not set
 # CONFIG_SMC91X is not set
 CONFIG_SND=m
 # CONFIG_SND_AC97_POWER_SAVE is not set
@@ -1601,7 +1627,9 @@ CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
 # CONFIG_SQUASHFS_VMALLOC is not set
 # CONFIG_SSB is not set
 # CONFIG_SSB_DEBUG is not set
+# CONFIG_SSB_DRIVER_MIPS is not set
 # CONFIG_SSB_PCMCIAHOST is not set
+# CONFIG_SSB_SILENT is not set
 # CONFIG_SSFDC is not set
 CONFIG_STACKTRACE_SUPPORT=y
 CONFIG_STANDALONE=y
@@ -1648,6 +1676,8 @@ CONFIG_TEXTSEARCH=y
 CONFIG_TEXTSEARCH_BM=m
 CONFIG_TEXTSEARCH_FSM=m
 CONFIG_TEXTSEARCH_KMP=m
+# CONFIG_THERMAL_HWMON is not set
+# CONFIG_THERMAL is not set
 # CONFIG_TIFM_CORE is not set
 # CONFIG_TIGON3 is not set
 CONFIG_TIMERFD=y
@@ -1706,7 +1736,7 @@ CONFIG_USB_DEVICEFS=y
 # CONFIG_USB_DEVICE_CLASS is not set
 # CONFIG_USB_DSBR is not set
 # CONFIG_USB_DYNAMIC_MINORS is not set
-# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
+CONFIG_USB_EHCI_ROOT_HUB_TT=y
 # CONFIG_USB_EHCI_SPLIT_ISO is not set
 # CONFIG_USB_EHCI_TT_NEWSCHED is not set
 # CONFIG_USB_EMI26 is not set