Resync brcm-2.4 kernel config and enable syncookies (#1876)

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

diff --git a/target/linux/brcm-2.4/config/default b/target/linux/brcm-2.4/config/default
index 9039acf..504acb6 100644 (file)
--- a/target/linux/brcm-2.4/config/default
+++ b/target/linux/brcm-2.4/config/default
@@ -145,6 +145,7 @@ CONFIG_IDEDMA_PCI_AUTO=y
 # CONFIG_IDE_CHIPSETS is not set
 # CONFIG_IDE_TASK_IOCTL is not set
 # CONFIG_IEEE1394 is not set
+CONFIG_IP6_NF_MATCH_LIMIT=m
 CONFIG_IP_VS=m
 # CONFIG_IP_VS_DEBUG is not set
 CONFIG_IP_VS_DH=m
@@ -184,6 +185,7 @@ CONFIG_NET_PCI=y
 CONFIG_NET_WIRELESS=y
 CONFIG_NEW_IRQ=y
 CONFIG_NEW_TIME_C=y
+CONFIG_NLS=y
 CONFIG_PARPORT=m
 # CONFIG_PARPORT_1284 is not set
 # CONFIG_PARPORT_AMIGA is not set
@@ -195,8 +197,6 @@ CONFIG_PARPORT=m
 # CONFIG_PARPORT_PC is not set
 CONFIG_PARPORT_SPLINK=m
 # CONFIG_PARPORT_SUNBPP is not set
-CONFIG_PCCARD=m
-CONFIG_PCCARD_NONSTATIC=m
 CONFIG_PCI=y
 CONFIG_PCI_AUTO=y
 # CONFIG_PCI_HERMES is not set

diff --git a/target/linux/generic-2.4/config-template b/target/linux/generic-2.4/config-template
index 0271539..13e6906 100644 (file)
--- a/target/linux/generic-2.4/config-template
+++ b/target/linux/generic-2.4/config-template
@@ -683,7 +683,7 @@ CONFIG_SQUASHFS=y
 # CONFIG_SUNQE is not set
 CONFIG_SUNRPC=m
 # CONFIG_SUN_PARTITION is not set
-# CONFIG_SYN_COOKIES is not set
+CONFIG_SYN_COOKIES=y
 CONFIG_SYSCTL=y
 CONFIG_SYSVIPC=y
 # CONFIG_SYSV_FS is not set