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 05726d1..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_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
 # 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_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
 # 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_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
 # CONFIG_B44 is not set
 # CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 CONFIG_BASE_FULL=y


@@ -221,7 +226,7 @@ CONFIG_CARDBUS=y
 # CONFIG_CASSINI is not set
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 # CONFIG_CDROM_PKTCDVD is not set
 # 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
 # CONFIG_CGROUPS is not set
 # CONFIG_CHELSIO_T1 is not set
 # CONFIG_CHELSIO_T3 is not set


@@ -770,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_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
 # CONFIG_IXGB is not set
 CONFIG_JBD=m
 # CONFIG_JBD_DEBUG is not set


@@ -823,6 +831,7 @@ CONFIG_LEDS_TRIGGER_TIMER=y
 # CONFIG_LEGACY_PTYS is not set
 CONFIG_LIBCRC32C=m
 # CONFIG_LIBERTAS is not set
 # 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
 # CONFIG_LIBERTAS_USB is not set
 CONFIG_LLC=y
 CONFIG_LLC2=m


@@ -834,9 +843,18 @@ CONFIG_LOCKD_V4=y
 CONFIG_LOG_BUF_SHIFT=14
 # CONFIG_LSF is not set
 # CONFIG_LXT_PHY is not set
 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_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_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
 # CONFIG_MACVLAN is not set
 # CONFIG_MAC_EMUMOUSEBTN is not set
 CONFIG_MAC_PARTITION=y


@@ -942,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_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_QUOTA is not set
 CONFIG_NETFILTER_XT_MATCH_RATEEST=m
 CONFIG_NETFILTER_XT_MATCH_REALM=m


@@ -954,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_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_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_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
 CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
 CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
 CONFIG_NETFILTER_XT_TARGET_TRACE=m


@@ -1094,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_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
 CONFIG_NLS=m
 # CONFIG_NLS_ASCII is not set
 CONFIG_NLS_CODEPAGE_1250=m


@@ -1153,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_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
 CONFIG_PACKET=y
 CONFIG_PACKET_MMAP=y
 # CONFIG_PARPORT is not set


@@ -1311,6 +1327,7 @@ CONFIG_RFKILL=m
 # CONFIG_ROSE is not set
 CONFIG_RPCSEC_GSS_KRB5=m
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
 # 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_CLASS is not set
 # CONFIG_RTC_DRV_BQ4802 is not set
 CONFIG_RTC_DRV_CMOS=y


@@ -1329,6 +1346,7 @@ CONFIG_RTC_DRV_CMOS=y
 # CONFIG_RTC_DRV_RTC7301 is not set
 # CONFIG_RTC_DRV_RX8581 is not set
 # CONFIG_RTC_DRV_S35390A 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
 # CONFIG_RTL8187 is not set
 CONFIG_RT_MUTEXES=y
 # CONFIG_S2IO is not set


@@ -1518,6 +1536,7 @@ CONFIG_SIGNALFD=y
 # CONFIG_SK98LIN is not set
 # CONFIG_SKGE is not set
 # CONFIG_SKY2 is not set
 # 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
 CONFIG_SLAB=y
 CONFIG_SLABINFO=y
 CONFIG_SLHC=m