merge netfilter kernel changes to 2.6.26 as well

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

diff --git a/target/linux/generic-2.6/config-2.6.26 b/target/linux/generic-2.6/config-2.6.26
index 474668b..f7e28d9 100644 (file)
--- a/target/linux/generic-2.6/config-2.6.26
+++ b/target/linux/generic-2.6/config-2.6.26
@@ -389,6 +389,9 @@ CONFIG_GENERIC_IRQ_PROBE=y
 CONFIG_GENERIC_TIME=y
 # CONFIG_GFS2_FS is not set
 CONFIG_GPIO_DEVICE=m
+# 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_GROUP_SCHED is not set
 # CONFIG_HAMACHI is not set
@@ -478,6 +481,13 @@ CONFIG_IDE_MAX_HWIFS=4
 CONFIG_IDE_PROC_FS=y
 # CONFIG_IDE_TASK_IOCTL is not set
 # CONFIG_IEEE1394 is not set
+# CONFIG_IEEE1394_DV1394 is not set
+# CONFIG_IEEE1394_ETH1394 is not set
+# CONFIG_IEEE1394_OHCI1394 is not set
+# CONFIG_IEEE1394_PCILYNX is not set
+# CONFIG_IEEE1394_RAWIO is not set
+# CONFIG_IEEE1394_VERBOSEDEBUG is not set
+# CONFIG_IEEE1394_VIDEO1394 is not set
 CONFIG_IEEE80211=m
 CONFIG_IEEE80211_CRYPT_CCMP=m
 CONFIG_IEEE80211_CRYPT_TKIP=m
@@ -607,12 +617,12 @@ CONFIG_IP_NF_CONNTRACK=y
 CONFIG_IP_NF_CONNTRACK_MARK=y
 CONFIG_IP_NF_CT_ACCT=y
 CONFIG_IP_NF_CT_PROTO_SCTP=m
-CONFIG_IP_NF_FILTER=y
+CONFIG_IP_NF_FILTER=m
 CONFIG_IP_NF_FTP=m
 CONFIG_IP_NF_H323=m
-CONFIG_IP_NF_IPTABLES=y
+CONFIG_IP_NF_IPTABLES=m
 CONFIG_IP_NF_IRC=m
-CONFIG_IP_NF_MANGLE=y
+CONFIG_IP_NF_MANGLE=m
 CONFIG_IP_NF_MATCH_ADDRTYPE=m
 CONFIG_IP_NF_MATCH_AH=m
 CONFIG_IP_NF_MATCH_ECN=m
@@ -657,10 +667,10 @@ CONFIG_IP_NF_SIP=m
 CONFIG_IP_NF_TARGET_ECN=m
 CONFIG_IP_NF_TARGET_IMQ=m
 CONFIG_IP_NF_TARGET_LOG=m
-CONFIG_IP_NF_TARGET_MASQUERADE=y
+CONFIG_IP_NF_TARGET_MASQUERADE=m
 CONFIG_IP_NF_TARGET_NETMAP=m
 CONFIG_IP_NF_TARGET_REDIRECT=m
-CONFIG_IP_NF_TARGET_REJECT=y
+CONFIG_IP_NF_TARGET_REJECT=m
 CONFIG_IP_NF_TARGET_ROUTE=m
 CONFIG_IP_NF_TARGET_SAME=m
 CONFIG_IP_NF_TARGET_SET=m
@@ -758,6 +768,7 @@ CONFIG_MAC_PARTITION=y
 # CONFIG_MARKERS is not set
 # CONFIG_MARVELL_PHY is not set
 # CONFIG_MD is not set
+# CONFIG_MEDIA_ATTACH is not set
 # CONFIG_MEDIA_TUNER_CUSTOMIZE is not set
 # CONFIG_MEGARAID_LEGACY is not set
 # CONFIG_MEGARAID_NEWGEN is not set
@@ -770,6 +781,8 @@ CONFIG_MINIX_FS=m
 # CONFIG_MINIX_SUBPARTITION is not set
 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
@@ -791,6 +804,7 @@ CONFIG_MSDOS_PARTITION=y
 # CONFIG_MTD_DATAFLASH is not set
 # CONFIG_MTD_M25P80 is not set
 # CONFIG_MTD_INTEL_VR_NOR is not set
+# CONFIG_MTD_MYLOADER_PARTS is not set
 # CONFIG_MTD_NAND is not set
 # CONFIG_MTD_OOPS is not set
 # CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
@@ -816,7 +830,7 @@ CONFIG_NETFILTER_ADVANCED=y
 # CONFIG_NETFILTER_NETLINK is not set
 # CONFIG_NETFILTER_NETLINK_LOG is not set
 # CONFIG_NETFILTER_NETLINK_QUEUE is not set
-CONFIG_NETFILTER_XTABLES=y
+CONFIG_NETFILTER_XTABLES=m
 CONFIG_NETFILTER_XT_MATCH_COMMENT=m
 CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
 CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
@@ -829,36 +843,32 @@ CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
 CONFIG_NETFILTER_XT_MATCH_HELPER=m
 CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
 CONFIG_NETFILTER_XT_MATCH_LENGTH=m
-CONFIG_NETFILTER_XT_MATCH_LIMIT=y
+CONFIG_NETFILTER_XT_MATCH_LIMIT=m
 CONFIG_NETFILTER_XT_MATCH_MAC=m
 CONFIG_NETFILTER_XT_MATCH_MARK=m
-CONFIG_NETFILTER_XT_MATCH_MULTIPORT=y
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
 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
 CONFIG_NETFILTER_XT_MATCH_SCTP=m
-CONFIG_NETFILTER_XT_MATCH_STATE=y
+CONFIG_NETFILTER_XT_MATCH_STATE=m
 # CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
 CONFIG_NETFILTER_XT_MATCH_STRING=m
 CONFIG_NETFILTER_XT_MATCH_TCPMSS=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=y
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
 CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
 CONFIG_NETFILTER_XT_TARGET_TRACE=m
 # CONFIG_NETPOLL is not set
@@ -951,13 +961,13 @@ CONFIG_NFS_V3=y
 # CONFIG_NFS_V3_ACL is not set
 CONFIG_NFS_V4=y
 # CONFIG_NFTL is not set
-CONFIG_NF_CONNTRACK=y
+CONFIG_NF_CONNTRACK=m
 CONFIG_NF_CONNTRACK_AMANDA=m
 CONFIG_NF_CONNTRACK_ENABLED=y
 # CONFIG_NF_CONNTRACK_EVENTS is not set
 CONFIG_NF_CONNTRACK_FTP=m
 CONFIG_NF_CONNTRACK_H323=m
-CONFIG_NF_CONNTRACK_IPV4=y
+CONFIG_NF_CONNTRACK_IPV4=m
 CONFIG_NF_CONNTRACK_IPV6=m
 CONFIG_NF_CONNTRACK_IRC=m
 CONFIG_NF_CONNTRACK_MARK=y
@@ -973,7 +983,7 @@ CONFIG_NF_CT_ACCT=y
 CONFIG_NF_CT_PROTO_GRE=m
 # CONFIG_NF_CT_PROTO_SCTP is not set
 # CONFIG_NF_CT_PROTO_UDPLITE is not set
-CONFIG_NF_NAT=y
+CONFIG_NF_NAT=m
 CONFIG_NF_NAT_AMANDA=m
 CONFIG_NF_NAT_FTP=m
 CONFIG_NF_NAT_H323=m
@@ -1033,11 +1043,13 @@ CONFIG_NORTEL_HERMES=m
 # CONFIG_NTFS_FS is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_OCF_BENCH is not set
+# CONFIG_OCF_EP80579 is not set
 # CONFIG_OCF_IXP4XX is not set
 # CONFIG_OCF_HIFN is not set
 # CONFIG_OCF_HIFNHIPP is not set
 # CONFIG_OCF_SAFE is not set
 # CONFIG_OCF_TALITOS is not set
+# CONFIG_OCF_OCF is not set
 # CONFIG_OCF_OCFNULL is not set
 # CONFIG_OCFS2_FS is not set
 # CONFIG_OSF_PARTITION is not set
@@ -1309,7 +1321,7 @@ CONFIG_SELECT_MEMORY_MODEL=y
 # CONFIG_SENSORS_F71882FG is not set
 # CONFIG_SENSORS_F75375S is not set
 # CONFIG_SENSORS_FSCHER is not set
-# CONFIG_SENSORS_FSCHMD is nost set
+# CONFIG_SENSORS_FSCHMD is not set
 # CONFIG_SENSORS_FSCPOS is not set
 # CONFIG_SENSORS_GL518SM is not set
 # CONFIG_SENSORS_GL520SM is not set
@@ -1505,11 +1517,11 @@ CONFIG_SND_VERBOSE_PROCFS=y
 # CONFIG_SNI_RM is not set
 # CONFIG_SOC_CAMERA is not set
 # CONFIG_SOLARIS_X86_PARTITION is not set
-# CONFIG_SOC_CAMERA is not set
 CONFIG_SOUND=m
 # CONFIG_SOUND_PRIME is not set
 # CONFIG_SPARSEMEM_MANUAL is not set
 # CONFIG_SPI is not set
+# CONFIG_SPI_DEBUG is not set
 # CONFIG_SPI_MASTER is not set
 # CONFIG_SPI_AT25 is not set
 # CONFIG_SPI_TLE62X0 is not set
@@ -1520,7 +1532,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
@@ -1533,6 +1547,7 @@ CONFIG_SUNRPC_GSS=m
 # CONFIG_SUN_PARTITION is not set
 CONFIG_SUSPEND_UP_POSSIBLE=y
 CONFIG_SWAP=y
+# CONFIG_SWCONFIG is not set
 # CONFIG_SYNCLINK_CS is not set
 CONFIG_SYN_COOKIES=y
 CONFIG_SYSCTL=y
@@ -1565,6 +1580,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
@@ -1641,6 +1658,7 @@ CONFIG_USB_HSO=m
 # CONFIG_USB_IBMCAM is not set
 # CONFIG_USB_IDMOUSE is not set
 # CONFIG_USB_IOWARRIOR is not set
+# CONFIG_USB_ISIGHTFW is not set
 # CONFIG_USB_ISP116X_HCD is not set
 # CONFIG_USB_ISP1760_HCD is not set
 CONFIG_USB_KAWETH=m
@@ -1762,14 +1780,13 @@ CONFIG_USB_STORAGE_SDDR09=y
 CONFIG_USB_STORAGE_SDDR55=y
 CONFIG_USB_STORAGE_USBAT=y
 # CONFIG_USB_STV680 is not set
-CONFIG_USB_SUPPORT=y
+# CONFIG_USB_SUPPORT is not set
 # CONFIG_USB_TEST is not set
 # CONFIG_USB_TOUCHSCREEN is not set
 # CONFIG_USB_TRANCEVIBRATOR is not set
 CONFIG_USB_UEAGLEATM=m
 CONFIG_USB_USBNET=m
 CONFIG_USB_USBNET_MII=m
-# CONFIG_USB_VIDEO_CLASS is not set
 # CONFIG_USB_VICAM is not set
 # CONFIG_USB_VIDEO_CLASS is not set
 # CONFIG_USB_W9968CF is not set
@@ -1788,6 +1805,7 @@ CONFIG_VFAT_FS=m
 # CONFIG_VIDEO_ADV7170 is not set
 # CONFIG_VIDEO_ADV7175 is not set
 # CONFIG_VIDEO_ADV_DEBUG is not set
+# CONFIG_VIDEO_ALLOW_V4L1 is not set
 # CONFIG_VIDEO_BT819 is not set
 # CONFIG_VIDEO_BT848 is not set
 # CONFIG_VIDEO_BT856 is not set