when changing the mac address of a bridge interface, keep member interface addresses...

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

diff --git a/target/linux/generic-2.6/config-2.6.34 b/target/linux/generic-2.6/config-2.6.34
index ae36574..cf629d2 100644 (file)
--- a/target/linux/generic-2.6/config-2.6.34
+++ b/target/linux/generic-2.6/config-2.6.34
@@ -389,6 +389,7 @@ CONFIG_CRYPTO_ALGAPI=y
 # CONFIG_CRYPTO_DEFLATE is not set
 # CONFIG_CRYPTO_DES is not set
 # CONFIG_CRYPTO_DEV_HIFN_795X is not set
 # CONFIG_CRYPTO_DEFLATE is not set
 # CONFIG_CRYPTO_DES is not set
 # CONFIG_CRYPTO_DEV_HIFN_795X is not set

+# CONFIG_CRYPTO_DEV_IFXMIPS is not set

 # CONFIG_CRYPTO_ECB is not set
 # CONFIG_CRYPTO_FCRYPT is not set
 # CONFIG_CRYPTO_FIPS is not set
 # CONFIG_CRYPTO_ECB is not set
 # CONFIG_CRYPTO_FCRYPT is not set
 # CONFIG_CRYPTO_FIPS is not set


@@ -1240,7 +1241,9 @@ CONFIG_LOG_BUF_SHIFT=14
 # CONFIG_LSI_ET1011C_PHY is not set
 # CONFIG_LTPC is not set
 # CONFIG_LXT_PHY is not set
 # CONFIG_LSI_ET1011C_PHY is not set
 # CONFIG_LTPC is not set
 # CONFIG_LXT_PHY is not set

-CONFIG_MAC80211_DEFAULT_PS_VALUE=1
+CONFIG_LZMA_COMPRESS=y
+CONFIG_LZMA_DECOMPRESS=y
+CCONFIG_MAC80211_DEFAULT_PS_VALUE=1

 CONFIG_MAC80211_DEFAULT_PS=y
 # CONFIG_MAC80211 is not set
 # CONFIG_MAC_EMUMOUSEBTN is not set
 CONFIG_MAC80211_DEFAULT_PS=y
 # CONFIG_MAC80211 is not set
 # CONFIG_MAC_EMUMOUSEBTN is not set


@@ -2371,7 +2374,6 @@ CONFIG_SQUASHFS_LZMA=y
 CONFIG_SQUASHFS_SUPPORT_ZLIB=y
 # CONFIG_SQUASHFS_VMALLOC is not set
 CONFIG_SQUASHFS=y
 CONFIG_SQUASHFS_SUPPORT_ZLIB=y
 # CONFIG_SQUASHFS_VMALLOC is not set
 CONFIG_SQUASHFS=y

-# CONFIG_SSB_BLOCKIO is not set

 # CONFIG_SSB_DEBUG is not set
 # CONFIG_SSB is not set
 # CONFIG_SSB_PCMCIAHOST is not set
 # CONFIG_SSB_DEBUG is not set
 # CONFIG_SSB is not set
 # CONFIG_SSB_PCMCIAHOST is not set