break trunk temporary - upgrade to 2.6.21.1 and iptables 1.3.7

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7315 3c298f89-4303-0410-b956-a3cf2f4a3e73

1 files changed, 56 insertions, 0 deletions

diff --git a/target/linux/generic-2.6/config-template b/target/linux/generic-2.6/config-template
index c9e3c0c1e..42695f3c2 100644
--- a/target/linux/generic-2.6/config-template
+++ b/target/linux/generic-2.6/config-template
@@ -20,6 +20,7 @@ CONFIG_ASK_IP_FIB_HASH=y
 # CONFIG_ATALK is not set
 # CONFIG_ATARI_PARTITION is not set
 # CONFIG_ATA_OVER_ETH is not set
+# CONFIG_ATL1 is not set
 CONFIG_ATM=m
 CONFIG_ATMEL=m
 # CONFIG_ATM_AMBASSADOR is not set
@@ -134,6 +135,7 @@ CONFIG_BT_SCO=m
 CONFIG_BUG=y
 # CONFIG_CAPI_AVM is not set
 # CONFIG_CAPI_EICON is not set
+# CONFIG_CAPI_TRACE is not set
 CONFIG_CARDBUS=y
 # CONFIG_CARDMAN_4000 is not set
 # CONFIG_CARDMAN_4040 is not set
@@ -141,6 +143,7 @@ CONFIG_CARDBUS=y
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_CHELSIO_T1 is not set
+# CONFIG_CHELSIO_T3 is not set
 # CONFIG_CHR_DEV_OSST is not set
 # CONFIG_CHR_DEV_SCH is not set
 # CONFIG_CHR_DEV_SG is not set
@@ -172,6 +175,7 @@ CONFIG_CRYPTO_ANUBIS=m
 CONFIG_CRYPTO_ARC4=m
 CONFIG_CRYPTO_BLKCIPHER=y
 CONFIG_CRYPTO_BLOWFISH=m
+# CONFIG_CRYPTO_CAMELLIA is not set
 CONFIG_CRYPTO_CAST5=m
 CONFIG_CRYPTO_CAST6=m
 CONFIG_CRYPTO_CBC=y
@@ -179,14 +183,18 @@ CONFIG_CRYPTO_CRC32C=m
 CONFIG_CRYPTO_DEFLATE=m
 CONFIG_CRYPTO_DES=y
 CONFIG_CRYPTO_ECB=m
+# CONFIG_CRYPTO_FCRYPT is not set
+# CONFIG_CRYPTO_GF128MUL is not set
 CONFIG_CRYPTO_HASH=m
 CONFIG_CRYPTO_HMAC=m
 CONFIG_CRYPTO_KHAZAD=m
+# CONFIG_CRYPTO_LRW is not set
 CONFIG_CRYPTO_MANAGER=y
 CONFIG_CRYPTO_MD4=m
 CONFIG_CRYPTO_MD5=y
 CONFIG_CRYPTO_MICHAEL_MIC=m
 CONFIG_CRYPTO_NULL=m
+# CONFIG_CRYPTO_PCBC is not set
 CONFIG_CRYPTO_SERPENT=m
 CONFIG_CRYPTO_SHA1=m
 CONFIG_CRYPTO_SHA256=m
@@ -197,6 +205,7 @@ CONFIG_CRYPTO_TGR192=m
 CONFIG_CRYPTO_TWOFISH=m
 CONFIG_CRYPTO_TWOFISH_COMMON=m
 CONFIG_CRYPTO_WP512=m
+# CONFIG_CRYPTO_XCBC is not set
 # CONFIG_DAVICOM_PHY is not set
 # CONFIG_DEBUG_FS is not set
 # CONFIG_DEBUG_KERNEL is not set
@@ -220,6 +229,7 @@ CONFIG_DEVFS_MOUNT=y
 # CONFIG_DGRS is not set
 # CONFIG_DISCONTIGMEM_MANUAL is not set
 # CONFIG_DL2K is not set
+# CONFIG_DLM is not set
 # CONFIG_DMA_ENGINE is not set
 # CONFIG_DNOTIFY is not set
 # CONFIG_DRM is not set
@@ -367,6 +377,7 @@ CONFIG_IP6_NF_MATCH_FRAG=m
 CONFIG_IP6_NF_MATCH_HL=m
 CONFIG_IP6_NF_MATCH_IPV6HEADER=m
 CONFIG_IP6_NF_MATCH_LIMIT=m
+# CONFIG_IP6_NF_MATCH_MH is not set
 CONFIG_IP6_NF_MATCH_OPTS=m
 CONFIG_IP6_NF_MATCH_OWNER=m
 CONFIG_IP6_NF_MATCH_RT=m
@@ -417,6 +428,7 @@ CONFIG_IP_NF_ARP_MANGLE=m
 CONFIG_IP_NF_CONNTRACK=y
 # CONFIG_IP_NF_CONNTRACK_EVENTS is not set
 CONFIG_IP_NF_CONNTRACK_MARK=y
+# CONFIG_IP_NF_CONNTRACK_SUPPORT is not set
 CONFIG_IP_NF_CT_ACCT=y
 CONFIG_IP_NF_CT_PROTO_SCTP=m
 CONFIG_IP_NF_FILTER=y
@@ -555,6 +567,7 @@ CONFIG_MAC_PARTITION=y
 # CONFIG_MEGARAID_LEGACY is not set
 # CONFIG_MEGARAID_NEWGEN is not set
 # CONFIG_MEGARAID_SAS is not set
+# CONFIG_MFD_SM501 is not set
 CONFIG_MII=y
 CONFIG_MINIX_FS=m
 # CONFIG_MINIX_SUBPARTITION is not set
@@ -587,6 +600,7 @@ CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y
 CONFIG_NETFILTER_XT_MATCH_DCCP=m
 CONFIG_NETFILTER_XT_MATCH_DSCP=m
 CONFIG_NETFILTER_XT_MATCH_ESP=m
+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
 CONFIG_NETFILTER_XT_MATCH_HELPER=m
 CONFIG_NETFILTER_XT_MATCH_LENGTH=m
 CONFIG_NETFILTER_XT_MATCH_LIMIT=y
@@ -610,11 +624,15 @@ 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_TCPMSS=m
+# CONFIG_NET_KEY_MIGRATE is not set
 # CONFIG_NETPOLL is not set
 # CONFIG_NETROM is not set
 # CONFIG_NETWORK_SECMARK is not set
+# CONFIG_NETXEN_NIC is not set
 CONFIG_NET_ACT_GACT=m
 CONFIG_NET_ACT_IPT=m
 CONFIG_NET_ACT_MIRRED=m
@@ -674,6 +692,26 @@ CONFIG_NET_SCH_TEQL=m
 CONFIG_NET_WIRELESS=y
 CONFIG_NET_WIRELESS_RTNETLINK=y
 CONFIG_NEW_LEDS=y
+# CONFIG_NF_CONNTRACK_AMANDA is not set
+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_IPV6 is not set
+CONFIG_NF_CONNTRACK_IRC=m
+# CONFIG_NF_CONNTRACK_MARK is not set
+# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
+# CONFIG_NF_CONNTRACK_PPTP is not set
+CONFIG_NF_CONNTRACK_PROC_COMPAT=y
+# CONFIG_NF_CONNTRACK_SANE is not set
+CONFIG_NF_CONNTRACK_SIP=m
+CONFIG_NF_CONNTRACK_SUPPORT=y
+# CONFIG_NF_CONNTRACK_TFTP is not set
+# CONFIG_NF_CT_ACCT is not set
+# CONFIG_NF_CT_PROTO_SCTP is not set
+# CONFIG_NF_NAT_SNMP_BASIC is not set
+CONFIG_NF_NAT=y
 CONFIG_NFSD=m
 CONFIG_NFSD_TCP=y
 # CONFIG_NFSD_V2_ACL is not set
@@ -739,6 +777,10 @@ CONFIG_PACKET=y
 CONFIG_PACKET_MMAP=y
 # CONFIG_PARPORT is not set
 CONFIG_PARTITION_ADVANCED=y
+# CONFIG_PATA_IT8213 is not set
+# CONFIG_PATA_MARVELL is not set
+CONFIG_PATA_PLATFORM=m
+# CONFIG_PC300TOO is not set
 # CONFIG_PCCARD is not set
 CONFIG_PCI=y
 CONFIG_PCI_ATMEL=m
@@ -810,8 +852,11 @@ CONFIG_ROMFS_FS=m
 CONFIG_RPCSEC_GSS_KRB5=m
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
 # CONFIG_RTC_CLASS is not set
+CONFIG_RTC_DRV_CMOS=y
 CONFIG_RT_MUTEXES=y
 # CONFIG_S2IO is not set
+# CONFIG_SATA_INIC162X is not set
+# CONFIG_SC92031 is not set
 CONFIG_SCSI=m
 # CONFIG_SCSI_3W_9XXX is not set
 # CONFIG_SCSI_AACRAID is not set
@@ -845,9 +890,12 @@ CONFIG_SCSI_PROC_FS=y
 # CONFIG_SCSI_QLOGIC_1280 is not set
 # CONFIG_SCSI_SAS_ATTRS is not set
 # CONFIG_SCSI_SAS_LIBSAS is not set
+# CONFIG_SCSI_SCAN_ASYNC is not set
 # CONFIG_SCSI_SPI_ATTRS is not set
+# CONFIG_SCSI_SRP is not set
 # CONFIG_SCSI_STEX is not set
 # CONFIG_SCSI_SYM53C8XX_2 is not set
+# CONFIG_SCSI_TGT is not set
 # CONFIG_SECURITY is not set
 CONFIG_SELECT_MEMORY_MODEL=y
 CONFIG_SERIAL_8250=y
@@ -980,6 +1028,7 @@ CONFIG_SYN_COOKIES=y
 CONFIG_SYSCTL=y
 CONFIG_SYSCTL_SYSCALL=y
 CONFIG_SYSFS=y
+# CONFIG_SYSFS_DEPRECATED is not set
 CONFIG_SYSVIPC=y
 # CONFIG_SYSV_FS is not set
 # CONFIG_SYS_HYPERVISOR is not set
@@ -996,6 +1045,7 @@ CONFIG_TCP_CONG_SCALABLE=m
 CONFIG_TCP_CONG_VEGAS=y
 CONFIG_TCP_CONG_VENO=m
 CONFIG_TCP_CONG_WESTWOOD=m
+# CONFIG_TCP_MD5SIG is not set
 CONFIG_TEXTSEARCH=y
 CONFIG_TEXTSEARCH_BM=m
 CONFIG_TEXTSEARCH_FSM=m
@@ -1037,6 +1087,7 @@ CONFIG_USB_ATM=m
 # CONFIG_USB_AUERSWALD is not set
 # CONFIG_USB_BANDWIDTH is not set
 CONFIG_USB_BELKIN=y
+# CONFIG_USB_BERRY_CHARGE is not set
 CONFIG_USB_CATC=m
 # CONFIG_USB_CXACRU is not set
 # CONFIG_USB_CYPRESS_CY7C63 is not set
@@ -1054,6 +1105,7 @@ CONFIG_USB_EZUSB=y
 # CONFIG_USB_GADGET is not set
 # CONFIG_USB_HID is not set
 # CONFIG_USB_IDMOUSE is not set
+# CONFIG_USB_IOWARRIOR is not set
 # CONFIG_USB_ISP116X_HCD is not set
 CONFIG_USB_KAWETH=m
 # CONFIG_USB_KBD is not set
@@ -1176,12 +1228,15 @@ CONFIG_VIDEO_V4L2=y
 # CONFIG_VIDEO_TEA6415C is not set
 # CONFIG_VIDEO_TEA6420 is not set
 # CONFIG_VIDEO_MSP3400 is not set
+# CONFIG_VIDEO_CAFE_CCIC is not set
 # CONFIG_VIDEO_CS53L32A is not set
 # CONFIG_VIDEO_TLV320AIC23B is not set
+# CONFIG_VIDEO_OV7670 is not set
 # CONFIG_VIDEO_WM8775 is not set
 # CONFIG_VIDEO_WM8739 is not set
 # CONFIG_VIDEO_SAA711X is not set
 # CONFIG_VIDEO_TVP5150 is not set
+# CONFIG_VIDEO_USBVISION is not set
 # CONFIG_VIDEO_CX25840 is not set
 # CONFIG_VIDEO_CX2341X is not set
 # CONFIG_VIDEO_SAA7127 is not set
@@ -1226,6 +1281,7 @@ CONFIG_WIRELESS_EXT=y
 # CONFIG_WR_PPMC is not set
 # CONFIG_X25 is not set
 CONFIG_XFRM=y
+# CONFIG_XFRM_MIGRATE is not set
 # CONFIG_XFRM_SUB_POLICY is not set
 CONFIG_XFRM_USER=m
 CONFIG_XFS_FS=m