merge netfilter changes to 2.6.27

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

diff --git a/target/linux/generic-2.6/config-2.6.28 b/target/linux/generic-2.6/config-2.6.28
index 995392a..ee342b6 100644 (file)
--- a/target/linux/generic-2.6/config-2.6.28
+++ b/target/linux/generic-2.6/config-2.6.28
@@ -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
@@ -30,6 +31,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_ATL2 is not set
@@ -62,6 +65,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
@@ -178,6 +183,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
@@ -220,7 +226,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
@@ -415,12 +421,15 @@ CONFIG_GENERIC_IRQ_PROBE=y
 CONFIG_GENERIC_TIME=y
 # CONFIG_GFS2_FS is not set
 CONFIG_GPIO_DEVICE=m
+# CONFIG_GPIO_BT8XX is not set
+# 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_GPIO_XILINX 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
@@ -437,8 +446,28 @@ CONFIG_HFSPLUS_FS=m
 CONFIG_HFS_FS=m
 # CONFIG_HID is not set
 # CONFIG_HIDRAW is not set
+# CONFIG_HID_A4TECH is not set
+# CONFIG_HID_APPLE is not set
+# CONFIG_HID_BELKIN is not set
+# CONFIG_HID_BRIGHT is not set
+# CONFIG_HID_CHERRY is not set
+# CONFIG_HID_CHICONY is not set
+# CONFIG_HID_COMPAT is not set
+# CONFIG_HID_CYPRESS is not set
 # CONFIG_HID_DEBUG is not set
+# CONFIG_HID_DELL is not set
+# CONFIG_HID_EZKEY is not set
 # CONFIG_HID_FF is not set
+# CONFIG_HID_GYRATION is not set
+# CONFIG_HID_LOGITECH is not set
+# CONFIG_HID_MICROSOFT is not set
+# CONFIG_HID_MONTEREY is not set
+# CONFIG_HID_PANTHERLORD is not set
+# CONFIG_HID_PETALYNX is not set
+# CONFIG_HID_PID is not set
+# CONFIG_HID_SAMSUNG is not set
+# CONFIG_HID_SONY is not set
+# CONFIG_HID_SUNPLUS is not set
 # CONFIG_HID_SUPPORT is not set
 CONFIG_HIGH_RES_TIMERS=y
 # CONFIG_HIPPI is not set
@@ -518,6 +547,7 @@ CONFIG_HZ_100=y
 # CONFIG_IDEDMA_IVB is not set
 # CONFIG_IDEDMA_ONLYDISK is not set
 # CONFIG_IDEPCI_SHARE_IRQ is not set
+# CONFIG_IDE_GD is not set
 CONFIG_IDE_MAX_HWIFS=4
 CONFIG_IDE_PROC_FS=y
 # CONFIG_IDE_TASK_IOCTL is not set
@@ -577,6 +607,7 @@ CONFIG_INIT_ENV_ARG_LIMIT=32
 # CONFIG_INPUT_ATI_REMOTE is not set
 # CONFIG_INPUT_ATI_REMOTE2 is not set
 # CONFIG_INPUT_ATLAS_BTNS is not set
+# CONFIG_INPUT_CM109 is not set
 # CONFIG_INPUT_EVBUG is not set
 CONFIG_INPUT_EVDEV=m
 # CONFIG_INPUT_FF_MEMLESS is not set
@@ -744,6 +775,9 @@ CONFIG_ISDN_CAPI_MIDDLEWARE=y
 # CONFIG_ISDN_I4L is not set
 CONFIG_ISO9660_FS=m
 # CONFIG_IWLWIFI_LEDS is not set
+# CONFIG_IWL3945 is not set
+# CONFIG_IWLAGN is not set
+# CONFIG_IWLCORE is not set
 # CONFIG_IXGB is not set
 CONFIG_JBD=m
 # CONFIG_JBD_DEBUG is not set
@@ -797,6 +831,7 @@ CONFIG_LEDS_TRIGGER_TIMER=y
 # CONFIG_LEGACY_PTYS is not set
 CONFIG_LIBCRC32C=m
 # CONFIG_LIBERTAS is not set
+# CONFIG_LIBERTAS_THINFIRM is not set
 # CONFIG_LIBERTAS_USB is not set
 CONFIG_LLC=y
 CONFIG_LLC2=m
@@ -808,9 +843,18 @@ 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_MINSTREL is not set
+CONFIG_MAC80211_RC_DEFAULT_PID=y
+# CONFIG_MAC80211_RC_MINSTREL is not set
+CONFIG_MAC80211_RC_PID=y
 # CONFIG_MACVLAN is not set
 # CONFIG_MAC_EMUMOUSEBTN is not set
 CONFIG_MAC_PARTITION=y
@@ -819,6 +863,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
@@ -836,6 +881,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
@@ -914,7 +960,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
@@ -926,17 +971,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
@@ -1066,6 +1108,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
@@ -1125,6 +1168,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
@@ -1215,6 +1259,7 @@ CONFIG_PLX_HERMES=m
 # CONFIG_PMIC_DA903X is not set
 # CONFIG_POSIX_MQUEUE is not set
 # CONFIG_POWER_SUPPLY is not set
+CONFIG_PPC4xx_GPIO=y
 CONFIG_PPP=m
 CONFIG_PPPOATM=m
 CONFIG_PPPOE=m
@@ -1241,6 +1286,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
@@ -1263,6 +1309,7 @@ CONFIG_PROC_SYSCTL=y
 CONFIG_RAMFS=y
 # CONFIG_RAW_DRIVER is not set
 # CONFIG_RCU_CPU_STALL_DETECTOR 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
@@ -1280,19 +1327,26 @@ 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_BQ4802 is not set
 CONFIG_RTC_DRV_CMOS=y
 # CONFIG_RTC_DRV_DS1286 is not set
+# CONFIG_RTC_DRV_DS1305 is not set
+# CONFIG_RTC_DRV_DS1390 is not set
 # CONFIG_RTC_DRV_DS1511 is not set
+# CONFIG_RTC_DRV_DS3234 is not set
 # CONFIG_RTC_DRV_FM3130 is not set
 # CONFIG_RTC_DRV_M48T35 is not set
+# CONFIG_RTC_DRV_M41T94 is not set
 # CONFIG_RTC_DRV_MAX6900 is not set
 # CONFIG_RTC_DRV_MAX6902 is not set
 # CONFIG_RTC_DRV_R9701 is not set
 # CONFIG_RTC_DRV_RS5C348 is not set
+# CONFIG_RTC_DRV_RTC7301 is not set
 # CONFIG_RTC_DRV_RX8581 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
@@ -1435,6 +1489,7 @@ CONFIG_SELECT_MEMORY_MODEL=y
 # CONFIG_SENSORS_LM92 is not set
 # CONFIG_SENSORS_LM93 is not set
 # CONFIG_SENSORS_M41T00 is not set
+# CONFIG_SENSORS_MAX1111 is not set
 # CONFIG_SENSORS_MAX1619 is not set
 # CONFIG_SENSORS_MAX6650 is not set
 # CONFIG_SENSORS_MAX6875 is not set
@@ -1481,6 +1536,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
@@ -1492,6 +1548,7 @@ CONFIG_SLHC=m
 # CONFIG_SMB_NLS_DEFAULT is not set
 # CONFIG_SMC911X is not set
 # CONFIG_SMC91X is not set
+# CONFIG_SMSC_PHY is not set
 CONFIG_SND=m
 # CONFIG_SND_AC97_POWER_SAVE is not set
 # CONFIG_SND_AD1816A is not set
@@ -1638,6 +1695,7 @@ CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
 # CONFIG_SSB_SILENT is not set
 # CONFIG_SSFDC is not set
 CONFIG_STACKTRACE_SUPPORT=y
+# CONFIG_STAGING is not set
 CONFIG_STANDALONE=y
 CONFIG_STP=y
 # CONFIG_STRIP is not set
@@ -1646,6 +1704,7 @@ CONFIG_STP=y
 CONFIG_SUNRPC=m
 # CONFIG_SUNRPC_BIND34 is not set
 CONFIG_SUNRPC_GSS=m
+# CONFIG_SUNRPC_REGISTER_V4 is not set
 # CONFIG_SUN_PARTITION is not set
 CONFIG_SUSPEND_UP_POSSIBLE=y
 CONFIG_SWAP=y
@@ -1684,6 +1743,7 @@ CONFIG_TEXTSEARCH_FSM=m
 CONFIG_TEXTSEARCH_KMP=m
 # CONFIG_THERMAL_HWMON is not set
 # CONFIG_THERMAL is not set
+# CONFIG_THRUSTMASTER_FF is not set
 # CONFIG_TIFM_CORE is not set
 # CONFIG_TIGON3 is not set
 CONFIG_TIMERFD=y
@@ -1759,6 +1819,7 @@ CONFIG_USB_HID=m
 CONFIG_USB_HIDINPUT=y
 # CONFIG_USB_HIDINPUT_POWERBOOK is not set
 CONFIG_USB_HSO=m
+# CONFIG_USB_HWA_HCD is not set
 # CONFIG_USB_IBMCAM is not set
 # CONFIG_USB_IDMOUSE is not set
 # CONFIG_USB_IOWARRIOR is not set
@@ -1790,6 +1851,7 @@ CONFIG_USB_NET_NET1080=m
 CONFIG_USB_NET_PLUSB=m
 CONFIG_USB_NET_RNDIS_HOST=m
 # CONFIG_USB_NET_RNDIS_WLAN is not set
+# CONFIG_USB_NET_SMSC95XX is not set
 CONFIG_USB_NET_ZAURUS=m
 # CONFIG_USB_OHCI_BIG_ENDIAN is not set
 # CONFIG_USB_OHCI_HCD is not set
@@ -1865,6 +1927,7 @@ CONFIG_USB_SERIAL_TI=m
 CONFIG_USB_SERIAL_VISOR=m
 CONFIG_USB_SERIAL_WHITEHEAT=m
 CONFIG_USB_SERIAL_XIRCOM=m
+# CONFIG_USB_SEVSEG is not set
 # CONFIG_USB_SISUSBVGA is not set
 # CONFIG_USB_SL811_HCD is not set
 # CONFIG_USB_SN9C102 is not set
@@ -1888,6 +1951,7 @@ CONFIG_USB_STORAGE_USBAT=y
 # CONFIG_USB_STV680 is not set
 # CONFIG_USB_SUPPORT is not set
 # CONFIG_USB_TEST is not set
+# CONFIG_USB_TMC is not set
 # CONFIG_USB_TOUCHSCREEN is not set
 # CONFIG_USB_TRANCEVIBRATOR is not set
 CONFIG_USB_UEAGLEATM=m
@@ -1895,15 +1959,19 @@ CONFIG_USB_USBNET=m
 CONFIG_USB_USBNET_MII=m
 # CONFIG_USB_VICAM is not set
 # CONFIG_USB_VIDEO_CLASS is not set
+# CONFIG_USB_VST is not set
 # CONFIG_USB_W9968CF is not set
 # CONFIG_USB_WACOM is not set
 # CONFIG_USB_WDM is not set
+# CONFIG_USB_WUSB is not set
+# CONFIG_USB_WUSB_CBAF is not set
 # CONFIG_USB_XPAD is not set
 # CONFIG_USB_XUSBATM is not set
 CONFIG_USB_YEALINK=m
 # CONFIG_USB_ZC0301 is not set
 # CONFIG_USB_ZD1201 is not set
 # CONFIG_USB_ZR364XX is not set
+# CONFIG_USB_WHCI_HCD is not set
 # CONFIG_USE_GENERIC_SMP_HELPERS is not set
 # CONFIG_UTS_NS is not set
 # CONFIG_UWB is not set
@@ -1929,6 +1997,7 @@ CONFIG_VFAT_FS=m
 CONFIG_VIDEO_DEV=m
 # CONFIG_VIDEO_DPC is not set
 # CONFIG_VIDEO_EM28XX is not set
+# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
 # CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set
 # CONFIG_VIDEO_HEXIUM_GEMINI is not set
 # CONFIG_VIDEO_HEXIUM_ORION is not set
@@ -1996,6 +2065,7 @@ CONFIG_W1=m
 # CONFIG_W1_MASTER_DS2490 is not set
 # CONFIG_W1_MASTER_GPIO is not set
 # CONFIG_W1_MASTER_MATROX is not set
+# CONFIG_W1_SLAVE_BQ27000 is not set
 # CONFIG_W1_SLAVE_DS2433 is not set
 # CONFIG_W1_SLAVE_DS2760 is not set
 # CONFIG_W1_SLAVE_SMEM is not set
@@ -2041,6 +2111,7 @@ CONFIG_YENTA=m
 # CONFIG_YENTA_TOSHIBA is not set
 CONFIG_ZD1211RW=m
 # CONFIG_ZD1211RW_DEBUG is not set
+# CONFIG_ZEROPLUS_FF is not set
 CONFIG_ZISOFS=y
 CONFIG_ZISOFS_FS=m
 CONFIG_ZLIB_DEFLATE=y