| Message ID | 20190612070641.15244-1-yuehaibing@huawei.com (mailing list archive) |
|---|---|
| State | Superseded, archived |
| Headers | show |
| Series | [net-next] defconfigs: remove obsolete CONFIG_INET_XFRM_MODE_* and CONFIG_INET6_XFRM_MODE_* | expand |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/apply_patch | warning | Failed to apply on branch next (a3bf9fbdad600b1e4335dd90979f8d6072e4f602) |
| snowpatch_ozlabs/apply_patch | fail | Failed to apply to any branch |
Pls ignore this, will fix and resend. On 2019/6/12 15:06, YueHaibing wrote: > These Kconfig options has been removed in > commit 4c145dce2601 ("xfrm: make xfrm modes builtin") > So there is no point to keep it in defconfigs any longer. > > Signed-off-by: YueHaibing <yuehaibing@huawei.com> > --- > arch/arc/configs/axs101_defconfig | 3 --- > arch/arc/configs/axs103_defconfig | 3 --- > arch/arc/configs/axs103_smp_defconfig | 3 --- > arch/arc/configs/haps_hs_defconfig | 3 --- > arch/arc/configs/haps_hs_smp_defconfig | 3 --- > arch/arc/configs/nps_defconfig | 3 --- > arch/arc/configs/nsimosci_hs_smp_defconfig | 3 --- > arch/arc/configs/tb10x_defconfig | 3 --- > arch/arm/configs/acs5k_tiny_defconfig | 3 --- > arch/arm/configs/am200epdkit_defconfig | 3 --- > arch/arm/configs/aspeed_g4_defconfig | 6 ------ > arch/arm/configs/aspeed_g5_defconfig | 6 ------ > arch/arm/configs/at91_dt_defconfig | 6 ------ > arch/arm/configs/cm_x300_defconfig | 3 --- > arch/arm/configs/efm32_defconfig | 3 --- > arch/arm/configs/ep93xx_defconfig | 3 --- > arch/arm/configs/ezx_defconfig | 3 --- > arch/arm/configs/h5000_defconfig | 3 --- > arch/arm/configs/imote2_defconfig | 3 --- > arch/arm/configs/imx_v4_v5_defconfig | 3 --- > arch/arm/configs/imx_v6_v7_defconfig | 3 --- > arch/arm/configs/iop13xx_defconfig | 3 --- > arch/arm/configs/iop32x_defconfig | 3 --- > arch/arm/configs/iop33x_defconfig | 3 --- > arch/arm/configs/keystone_defconfig | 3 --- > arch/arm/configs/lpc18xx_defconfig | 3 --- > arch/arm/configs/lpc32xx_defconfig | 3 --- > arch/arm/configs/lpd270_defconfig | 3 --- > arch/arm/configs/magician_defconfig | 3 --- > arch/arm/configs/mini2440_defconfig | 3 --- > arch/arm/configs/moxart_defconfig | 3 --- > arch/arm/configs/mps2_defconfig | 3 --- > arch/arm/configs/mxs_defconfig | 3 --- > arch/arm/configs/omap1_defconfig | 3 --- > arch/arm/configs/palmz72_defconfig | 3 --- > arch/arm/configs/pcm027_defconfig | 3 --- > arch/arm/configs/pxa3xx_defconfig | 3 --- > arch/arm/configs/qcom_defconfig | 3 --- > arch/arm/configs/rpc_defconfig | 6 ------ > arch/arm/configs/s3c2410_defconfig | 1 - > arch/arm/configs/sama5_defconfig | 6 ------ > arch/arm/configs/sunxi_defconfig | 3 --- > arch/arm/configs/tango4_defconfig | 3 --- > arch/arm/configs/tegra_defconfig | 2 -- > arch/arm/configs/xcep_defconfig | 3 --- > arch/hexagon/configs/comet_defconfig | 3 --- > arch/m68k/configs/amcore_defconfig | 3 --- > arch/m68k/configs/m5208evb_defconfig | 3 --- > arch/m68k/configs/m5249evb_defconfig | 3 --- > arch/m68k/configs/m5272c3_defconfig | 3 --- > arch/m68k/configs/m5275evb_defconfig | 3 --- > arch/m68k/configs/m5307c3_defconfig | 3 --- > arch/m68k/configs/m5407c3_defconfig | 3 --- > arch/mips/configs/ar7_defconfig | 3 --- > arch/mips/configs/ath25_defconfig | 3 --- > arch/mips/configs/ath79_defconfig | 3 --- > arch/mips/configs/bcm63xx_defconfig | 3 --- > arch/mips/configs/bigsur_defconfig | 3 --- > arch/mips/configs/bmips_be_defconfig | 3 --- > arch/mips/configs/bmips_stb_defconfig | 3 --- > arch/mips/configs/capcella_defconfig | 3 --- > arch/mips/configs/ci20_defconfig | 3 --- > arch/mips/configs/db1xxx_defconfig | 1 - > arch/mips/configs/decstation_64_defconfig | 4 ---- > arch/mips/configs/decstation_defconfig | 4 ---- > arch/mips/configs/decstation_r4k_defconfig | 4 ---- > arch/mips/configs/fuloong2e_defconfig | 2 -- > arch/mips/configs/gpr_defconfig | 3 --- > arch/mips/configs/ip22_defconfig | 4 ---- > arch/mips/configs/ip27_defconfig | 7 ------- > arch/mips/configs/ip28_defconfig | 3 --- > arch/mips/configs/jazz_defconfig | 2 -- > arch/mips/configs/jmr3927_defconfig | 3 --- > arch/mips/configs/lasat_defconfig | 3 --- > arch/mips/configs/lemote2f_defconfig | 3 --- > arch/mips/configs/loongson1b_defconfig | 3 --- > arch/mips/configs/loongson1c_defconfig | 3 --- > arch/mips/configs/malta_defconfig | 2 -- > arch/mips/configs/malta_kvm_defconfig | 2 -- > arch/mips/configs/malta_kvm_guest_defconfig | 2 -- > arch/mips/configs/maltaup_xpa_defconfig | 2 -- > arch/mips/configs/markeins_defconfig | 4 ---- > arch/mips/configs/mpc30x_defconfig | 3 --- > arch/mips/configs/mtx1_defconfig | 4 ---- > arch/mips/configs/nlm_xlp_defconfig | 7 ------- > arch/mips/configs/nlm_xlr_defconfig | 7 ------- > arch/mips/configs/omega2p_defconfig | 3 --- > arch/mips/configs/pistachio_defconfig | 6 ------ > arch/mips/configs/qi_lb60_defconfig | 3 --- > arch/mips/configs/rb532_defconfig | 3 --- > arch/mips/configs/rbtx49xx_defconfig | 3 --- > arch/mips/configs/rm200_defconfig | 4 ---- > arch/mips/configs/rt305x_defconfig | 3 --- > arch/mips/configs/sb1250_swarm_defconfig | 3 --- > arch/mips/configs/tb0219_defconfig | 3 --- > arch/mips/configs/tb0226_defconfig | 3 --- > arch/mips/configs/tb0287_defconfig | 3 --- > arch/mips/configs/vocore2_defconfig | 3 --- > arch/mips/configs/workpad_defconfig | 3 --- > arch/mips/configs/xway_defconfig | 3 --- > arch/nios2/configs/10m50_defconfig | 3 --- > arch/nios2/configs/3c120_defconfig | 3 --- > arch/openrisc/configs/or1ksim_defconfig | 3 --- > arch/openrisc/configs/simple_smp_defconfig | 3 --- > arch/parisc/configs/c8000_defconfig | 1 - > arch/parisc/configs/generic-32bit_defconfig | 3 --- > arch/parisc/configs/generic-64bit_defconfig | 3 --- > arch/powerpc/configs/40x/acadia_defconfig | 3 --- > arch/powerpc/configs/40x/ep405_defconfig | 3 --- > arch/powerpc/configs/40x/kilauea_defconfig | 3 --- > arch/powerpc/configs/40x/makalu_defconfig | 3 --- > arch/powerpc/configs/40x/obs600_defconfig | 3 --- > arch/powerpc/configs/40x/walnut_defconfig | 3 --- > arch/powerpc/configs/44x/akebono_defconfig | 3 --- > arch/powerpc/configs/44x/arches_defconfig | 3 --- > arch/powerpc/configs/44x/bamboo_defconfig | 3 --- > arch/powerpc/configs/44x/canyonlands_defconfig | 3 --- > arch/powerpc/configs/44x/currituck_defconfig | 3 --- > arch/powerpc/configs/44x/ebony_defconfig | 3 --- > arch/powerpc/configs/44x/eiger_defconfig | 3 --- > arch/powerpc/configs/44x/fsp2_defconfig | 3 --- > arch/powerpc/configs/44x/icon_defconfig | 3 --- > arch/powerpc/configs/44x/iss476-smp_defconfig | 3 --- > arch/powerpc/configs/44x/katmai_defconfig | 3 --- > arch/powerpc/configs/44x/rainier_defconfig | 3 --- > arch/powerpc/configs/44x/redwood_defconfig | 3 --- > arch/powerpc/configs/44x/sam440ep_defconfig | 3 --- > arch/powerpc/configs/44x/sequoia_defconfig | 3 --- > arch/powerpc/configs/44x/taishan_defconfig | 3 --- > arch/powerpc/configs/52xx/pcm030_defconfig | 3 --- > arch/powerpc/configs/83xx/kmeter1_defconfig | 3 --- > arch/powerpc/configs/83xx/mpc837x_rdb_defconfig | 3 --- > arch/powerpc/configs/85xx/ge_imp3a_defconfig | 1 - > arch/powerpc/configs/85xx/xes_mpc85xx_defconfig | 3 --- > arch/powerpc/configs/adder875_defconfig | 3 --- > arch/powerpc/configs/amigaone_defconfig | 3 --- > arch/powerpc/configs/cell_defconfig | 2 -- > arch/powerpc/configs/chrp32_defconfig | 3 --- > arch/powerpc/configs/ep88xc_defconfig | 3 --- > arch/powerpc/configs/gamecube_defconfig | 3 --- > arch/powerpc/configs/mpc512x_defconfig | 3 --- > arch/powerpc/configs/mpc885_ads_defconfig | 3 --- > arch/powerpc/configs/pmac32_defconfig | 2 -- > arch/powerpc/configs/powernv_defconfig | 3 --- > arch/powerpc/configs/ppc40x_defconfig | 3 --- > arch/powerpc/configs/ppc44x_defconfig | 3 --- > arch/powerpc/configs/ppc6xx_defconfig | 4 ---- > arch/powerpc/configs/ps3_defconfig | 3 --- > arch/powerpc/configs/skiroot_defconfig | 3 --- > arch/powerpc/configs/storcenter_defconfig | 3 --- > arch/powerpc/configs/tqm8xx_defconfig | 3 --- > arch/powerpc/configs/wii_defconfig | 3 --- > arch/s390/configs/debug_defconfig | 7 ------- > arch/s390/configs/performance_defconfig | 7 ------- > arch/sh/configs/ap325rxa_defconfig | 3 --- > arch/sh/configs/ecovec24-romimage_defconfig | 3 --- > arch/sh/configs/ecovec24_defconfig | 3 --- > arch/sh/configs/edosk7760_defconfig | 3 --- > arch/sh/configs/kfr2r09-romimage_defconfig | 3 --- > arch/sh/configs/kfr2r09_defconfig | 3 --- > arch/sh/configs/magicpanelr2_defconfig | 3 --- > arch/sh/configs/polaris_defconfig | 3 --- > arch/sh/configs/rsk7203_defconfig | 3 --- > arch/sh/configs/rsk7264_defconfig | 3 --- > arch/sh/configs/rsk7269_defconfig | 3 --- > arch/sh/configs/sdk7780_defconfig | 2 -- > arch/sh/configs/se7206_defconfig | 3 --- > arch/sh/configs/se7724_defconfig | 3 --- > arch/sh/configs/se7780_defconfig | 3 --- > arch/sh/configs/secureedge5410_defconfig | 3 --- > arch/sh/configs/sh2007_defconfig | 3 --- > arch/x86/configs/i386_defconfig | 3 --- > arch/x86/configs/x86_64_defconfig | 3 --- > arch/xtensa/configs/cadence_csp_defconfig | 3 --- > 174 files changed, 550 deletions(-) > > diff --git a/arch/arc/configs/axs101_defconfig b/arch/arc/configs/axs101_defconfig > index e31a8eb..714e9fd 100644 > --- a/arch/arc/configs/axs101_defconfig > +++ b/arch/arc/configs/axs101_defconfig > @@ -35,9 +35,6 @@ CONFIG_IP_PNP=y > CONFIG_IP_PNP_DHCP=y > CONFIG_IP_PNP_BOOTP=y > CONFIG_IP_PNP_RARP=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_IPV6 is not set > CONFIG_DEVTMPFS=y > # CONFIG_STANDALONE is not set > diff --git a/arch/arc/configs/axs103_defconfig b/arch/arc/configs/axs103_defconfig > index e0e8567..495585c 100644 > --- a/arch/arc/configs/axs103_defconfig > +++ b/arch/arc/configs/axs103_defconfig > @@ -34,9 +34,6 @@ CONFIG_IP_PNP=y > CONFIG_IP_PNP_DHCP=y > CONFIG_IP_PNP_BOOTP=y > CONFIG_IP_PNP_RARP=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_IPV6 is not set > CONFIG_DEVTMPFS=y > # CONFIG_STANDALONE is not set > diff --git a/arch/arc/configs/axs103_smp_defconfig b/arch/arc/configs/axs103_smp_defconfig > index fcbc952..eec7282 100644 > --- a/arch/arc/configs/axs103_smp_defconfig > +++ b/arch/arc/configs/axs103_smp_defconfig > @@ -35,9 +35,6 @@ CONFIG_IP_PNP=y > CONFIG_IP_PNP_DHCP=y > CONFIG_IP_PNP_BOOTP=y > CONFIG_IP_PNP_RARP=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_IPV6 is not set > CONFIG_DEVTMPFS=y > # CONFIG_STANDALONE is not set > diff --git a/arch/arc/configs/haps_hs_defconfig b/arch/arc/configs/haps_hs_defconfig > index b117e6c..80c1ad0 100644 > --- a/arch/arc/configs/haps_hs_defconfig > +++ b/arch/arc/configs/haps_hs_defconfig > @@ -29,9 +29,6 @@ CONFIG_UNIX=y > CONFIG_UNIX_DIAG=y > CONFIG_NET_KEY=y > CONFIG_INET=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_IPV6 is not set > # CONFIG_WIRELESS is not set > CONFIG_DEVTMPFS=y > diff --git a/arch/arc/configs/haps_hs_smp_defconfig b/arch/arc/configs/haps_hs_smp_defconfig > index 33a787c..f90aaad 100644 > --- a/arch/arc/configs/haps_hs_smp_defconfig > +++ b/arch/arc/configs/haps_hs_smp_defconfig > @@ -32,9 +32,6 @@ CONFIG_UNIX=y > CONFIG_UNIX_DIAG=y > CONFIG_NET_KEY=y > CONFIG_INET=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_IPV6 is not set > # CONFIG_WIRELESS is not set > CONFIG_DEVTMPFS=y > diff --git a/arch/arc/configs/nps_defconfig b/arch/arc/configs/nps_defconfig > index f0a077c..f284f9d 100644 > --- a/arch/arc/configs/nps_defconfig > +++ b/arch/arc/configs/nps_defconfig > @@ -36,9 +36,6 @@ CONFIG_NET=y > CONFIG_UNIX=y > CONFIG_INET=y > CONFIG_IP_PNP=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_INET_DIAG is not set > # CONFIG_IPV6 is not set > # CONFIG_WIRELESS is not set > diff --git a/arch/arc/configs/nsimosci_hs_smp_defconfig b/arch/arc/configs/nsimosci_hs_smp_defconfig > index 1a4bc7b..8f858a5 100644 > --- a/arch/arc/configs/nsimosci_hs_smp_defconfig > +++ b/arch/arc/configs/nsimosci_hs_smp_defconfig > @@ -28,9 +28,6 @@ CONFIG_UNIX=y > CONFIG_UNIX_DIAG=y > CONFIG_NET_KEY=y > CONFIG_INET=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_IPV6 is not set > # CONFIG_WIRELESS is not set > CONFIG_DEVTMPFS=y > diff --git a/arch/arc/configs/tb10x_defconfig b/arch/arc/configs/tb10x_defconfig > index 5b5119d..445cf12 100644 > --- a/arch/arc/configs/tb10x_defconfig > +++ b/arch/arc/configs/tb10x_defconfig > @@ -36,9 +36,6 @@ CONFIG_PACKET=y > CONFIG_UNIX=y > CONFIG_INET=y > CONFIG_IP_MULTICAST=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_INET_DIAG is not set > # CONFIG_IPV6 is not set > # CONFIG_WIRELESS is not set > diff --git a/arch/arm/configs/acs5k_tiny_defconfig b/arch/arm/configs/acs5k_tiny_defconfig > index 25c593d..d38ba59 100644 > --- a/arch/arm/configs/acs5k_tiny_defconfig > +++ b/arch/arm/configs/acs5k_tiny_defconfig > @@ -21,9 +21,6 @@ CONFIG_NET=y > CONFIG_PACKET=y > CONFIG_UNIX=y > CONFIG_INET=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_IPV6 is not set > CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" > CONFIG_MTD=y > diff --git a/arch/arm/configs/am200epdkit_defconfig b/arch/arm/configs/am200epdkit_defconfig > index 8c9b6ea..9a8afb2 100644 > --- a/arch/arm/configs/am200epdkit_defconfig > +++ b/arch/arm/configs/am200epdkit_defconfig > @@ -26,9 +26,6 @@ CONFIG_NET=y > CONFIG_PACKET=m > CONFIG_UNIX=y > CONFIG_INET=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_INET_DIAG is not set > # CONFIG_IPV6 is not set > CONFIG_BT=m > diff --git a/arch/arm/configs/aspeed_g4_defconfig b/arch/arm/configs/aspeed_g4_defconfig > index 190d6e9..f0ed931 100644 > --- a/arch/arm/configs/aspeed_g4_defconfig > +++ b/arch/arm/configs/aspeed_g4_defconfig > @@ -51,13 +51,7 @@ CONFIG_UNIX_DIAG=y > CONFIG_INET=y > CONFIG_IP_MULTICAST=y > CONFIG_SYN_COOKIES=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_INET_DIAG is not set > -# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET6_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET6_XFRM_MODE_BEET is not set > CONFIG_NETFILTER=y > # CONFIG_NETFILTER_ADVANCED is not set > CONFIG_VLAN_8021Q=y > diff --git a/arch/arm/configs/aspeed_g5_defconfig b/arch/arm/configs/aspeed_g5_defconfig > index 407ffb7..764e476 100644 > --- a/arch/arm/configs/aspeed_g5_defconfig > +++ b/arch/arm/configs/aspeed_g5_defconfig > @@ -51,13 +51,7 @@ CONFIG_UNIX_DIAG=y > CONFIG_INET=y > CONFIG_IP_MULTICAST=y > CONFIG_SYN_COOKIES=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_INET_DIAG is not set > -# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET6_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET6_XFRM_MODE_BEET is not set > CONFIG_NETFILTER=y > # CONFIG_NETFILTER_ADVANCED is not set > CONFIG_VLAN_8021Q=y > diff --git a/arch/arm/configs/at91_dt_defconfig b/arch/arm/configs/at91_dt_defconfig > index a88e314..3e55f96 100644 > --- a/arch/arm/configs/at91_dt_defconfig > +++ b/arch/arm/configs/at91_dt_defconfig > @@ -36,13 +36,7 @@ CONFIG_IP_PNP=y > CONFIG_IP_PNP_DHCP=y > CONFIG_IP_PNP_BOOTP=y > CONFIG_IP_PNP_RARP=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_INET_DIAG is not set > -# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET6_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET6_XFRM_MODE_BEET is not set > CONFIG_IPV6_SIT_6RD=y > CONFIG_CFG80211=y > CONFIG_MAC80211=y > diff --git a/arch/arm/configs/cm_x300_defconfig b/arch/arm/configs/cm_x300_defconfig > index 3707a01..5d032f1 100644 > --- a/arch/arm/configs/cm_x300_defconfig > +++ b/arch/arm/configs/cm_x300_defconfig > @@ -31,9 +31,6 @@ CONFIG_IP_PNP=y > CONFIG_IP_PNP_DHCP=y > CONFIG_IP_PNP_BOOTP=y > CONFIG_IP_PNP_RARP=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_INET_DIAG is not set > # CONFIG_IPV6 is not set > CONFIG_BT=m > diff --git a/arch/arm/configs/efm32_defconfig b/arch/arm/configs/efm32_defconfig > index 10ea925..0f3667b 100644 > --- a/arch/arm/configs/efm32_defconfig > +++ b/arch/arm/configs/efm32_defconfig > @@ -34,9 +34,6 @@ CONFIG_NET=y > CONFIG_PACKET=y > CONFIG_UNIX=y > CONFIG_INET=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_INET_DIAG is not set > # CONFIG_IPV6 is not set > # CONFIG_WIRELESS is not set > diff --git a/arch/arm/configs/ep93xx_defconfig b/arch/arm/configs/ep93xx_defconfig > index 14889a7..7448fda 100644 > --- a/arch/arm/configs/ep93xx_defconfig > +++ b/arch/arm/configs/ep93xx_defconfig > @@ -46,9 +46,6 @@ CONFIG_IP_PNP_DHCP=y > CONFIG_IP_PNP_BOOTP=y > CONFIG_SYN_COOKIES=y > CONFIG_IPV6=y > -# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET6_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET6_XFRM_MODE_BEET is not set > # CONFIG_IPV6_SIT is not set > CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" > # CONFIG_FW_LOADER is not set > diff --git a/arch/arm/configs/ezx_defconfig b/arch/arm/configs/ezx_defconfig > index e3afca5..3bc8a50 100644 > --- a/arch/arm/configs/ezx_defconfig > +++ b/arch/arm/configs/ezx_defconfig > @@ -45,9 +45,6 @@ CONFIG_IP_PNP_DHCP=y > CONFIG_IP_PNP_BOOTP=y > CONFIG_IP_PNP_RARP=y > CONFIG_SYN_COOKIES=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_INET_DIAG is not set > CONFIG_INET6_AH=m > CONFIG_INET6_ESP=m > diff --git a/arch/arm/configs/h5000_defconfig b/arch/arm/configs/h5000_defconfig > index e90d1df..fc9e997 100644 > --- a/arch/arm/configs/h5000_defconfig > +++ b/arch/arm/configs/h5000_defconfig > @@ -27,9 +27,6 @@ CONFIG_UNIX=y > CONFIG_INET=y > CONFIG_IP_MULTICAST=y > CONFIG_IP_PNP=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_INET_DIAG is not set > # CONFIG_IPV6 is not set > CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" > diff --git a/arch/arm/configs/imote2_defconfig b/arch/arm/configs/imote2_defconfig > index 9b779e1..d68a0f1 100644 > --- a/arch/arm/configs/imote2_defconfig > +++ b/arch/arm/configs/imote2_defconfig > @@ -38,9 +38,6 @@ CONFIG_IP_PNP_DHCP=y > CONFIG_IP_PNP_BOOTP=y > CONFIG_IP_PNP_RARP=y > CONFIG_SYN_COOKIES=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_INET_DIAG is not set > CONFIG_INET6_AH=m > CONFIG_INET6_ESP=m > diff --git a/arch/arm/configs/imx_v4_v5_defconfig b/arch/arm/configs/imx_v4_v5_defconfig > index f2cf072..6810ce7 100644 > --- a/arch/arm/configs/imx_v4_v5_defconfig > +++ b/arch/arm/configs/imx_v4_v5_defconfig > @@ -41,9 +41,6 @@ CONFIG_INET=y > CONFIG_IP_MULTICAST=y > CONFIG_IP_PNP=y > CONFIG_IP_PNP_DHCP=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_INET_DIAG is not set > # CONFIG_IPV6 is not set > CONFIG_NETFILTER=y > diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig > index 6589820..0b79b48 100644 > --- a/arch/arm/configs/imx_v6_v7_defconfig > +++ b/arch/arm/configs/imx_v6_v7_defconfig > @@ -75,9 +75,6 @@ CONFIG_UNIX=y > CONFIG_INET=y > CONFIG_IP_PNP=y > CONFIG_IP_PNP_DHCP=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > CONFIG_NETFILTER=y > CONFIG_CAN=y > CONFIG_CAN_FLEXCAN=y > diff --git a/arch/arm/configs/iop13xx_defconfig b/arch/arm/configs/iop13xx_defconfig > index a73b6a3..c5c1372 100644 > --- a/arch/arm/configs/iop13xx_defconfig > +++ b/arch/arm/configs/iop13xx_defconfig > @@ -30,9 +30,6 @@ CONFIG_IP_MULTICAST=y > CONFIG_IP_PNP=y > CONFIG_IP_PNP_BOOTP=y > CONFIG_IPV6=y > -# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET6_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET6_XFRM_MODE_BEET is not set > # CONFIG_IPV6_SIT is not set > CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" > CONFIG_MTD=y > diff --git a/arch/arm/configs/iop32x_defconfig b/arch/arm/configs/iop32x_defconfig > index f63362b..a8c6a89 100644 > --- a/arch/arm/configs/iop32x_defconfig > +++ b/arch/arm/configs/iop32x_defconfig > @@ -26,9 +26,6 @@ CONFIG_IP_MULTICAST=y > CONFIG_IP_PNP=y > CONFIG_IP_PNP_BOOTP=y > CONFIG_IPV6=y > -# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET6_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET6_XFRM_MODE_BEET is not set > # CONFIG_IPV6_SIT is not set > CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" > CONFIG_MTD=y > diff --git a/arch/arm/configs/iop33x_defconfig b/arch/arm/configs/iop33x_defconfig > index d22f832..8529828 100644 > --- a/arch/arm/configs/iop33x_defconfig > +++ b/arch/arm/configs/iop33x_defconfig > @@ -24,9 +24,6 @@ CONFIG_IP_MULTICAST=y > CONFIG_IP_PNP=y > CONFIG_IP_PNP_BOOTP=y > CONFIG_IPV6=y > -# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET6_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET6_XFRM_MODE_BEET is not set > # CONFIG_IPV6_SIT is not set > CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" > CONFIG_MTD=y > diff --git a/arch/arm/configs/keystone_defconfig b/arch/arm/configs/keystone_defconfig > index 72fee57..c7007b2 100644 > --- a/arch/arm/configs/keystone_defconfig > +++ b/arch/arm/configs/keystone_defconfig > @@ -66,9 +66,6 @@ CONFIG_IP_MROUTE_MULTIPLE_TABLES=y > CONFIG_IP_PIMSM_V2=y > CONFIG_INET_AH=y > CONFIG_INET_IPCOMP=y > -CONFIG_INET6_XFRM_MODE_TRANSPORT=m > -CONFIG_INET6_XFRM_MODE_TUNNEL=m > -CONFIG_INET6_XFRM_MODE_BEET=m > CONFIG_IPV6_SIT=m > CONFIG_IPV6_MULTIPLE_TABLES=y > CONFIG_IPV6_SUBTREES=y > diff --git a/arch/arm/configs/lpc18xx_defconfig b/arch/arm/configs/lpc18xx_defconfig > index e3d5e15..c7c3d3e 100644 > --- a/arch/arm/configs/lpc18xx_defconfig > +++ b/arch/arm/configs/lpc18xx_defconfig > @@ -40,9 +40,6 @@ CONFIG_NET=y > CONFIG_PACKET=y > CONFIG_UNIX=y > CONFIG_INET=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_INET_DIAG is not set > # CONFIG_IPV6 is not set > # CONFIG_WIRELESS is not set > diff --git a/arch/arm/configs/lpc32xx_defconfig b/arch/arm/configs/lpc32xx_defconfig > index 4b3b2c6..68fae31 100644 > --- a/arch/arm/configs/lpc32xx_defconfig > +++ b/arch/arm/configs/lpc32xx_defconfig > @@ -35,9 +35,6 @@ CONFIG_IP_MULTICAST=y > CONFIG_IP_PNP=y > CONFIG_IP_PNP_DHCP=y > CONFIG_IP_PNP_BOOTP=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_INET_DIAG is not set > # CONFIG_WIRELESS is not set > CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" > diff --git a/arch/arm/configs/lpd270_defconfig b/arch/arm/configs/lpd270_defconfig > index 3a4d0e6..1d60896 100644 > --- a/arch/arm/configs/lpd270_defconfig > +++ b/arch/arm/configs/lpd270_defconfig > @@ -15,9 +15,6 @@ CONFIG_INET=y > CONFIG_IP_PNP=y > CONFIG_IP_PNP_BOOTP=y > CONFIG_IPV6=y > -# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET6_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET6_XFRM_MODE_BEET is not set > # CONFIG_IPV6_SIT is not set > CONFIG_MTD=y > CONFIG_MTD_REDBOOT_PARTS=y > diff --git a/arch/arm/configs/magician_defconfig b/arch/arm/configs/magician_defconfig > index de5be2f..1f6fa24 100644 > --- a/arch/arm/configs/magician_defconfig > +++ b/arch/arm/configs/magician_defconfig > @@ -31,9 +31,6 @@ CONFIG_UNIX=y > CONFIG_INET=y > CONFIG_IP_MULTICAST=y > CONFIG_IP_PNP=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_INET_DIAG is not set > # CONFIG_IPV6 is not set > CONFIG_IRDA=m > diff --git a/arch/arm/configs/mini2440_defconfig b/arch/arm/configs/mini2440_defconfig > index 7d26ca0..b70577c9 100644 > --- a/arch/arm/configs/mini2440_defconfig > +++ b/arch/arm/configs/mini2440_defconfig > @@ -46,9 +46,6 @@ CONFIG_IP_MROUTE=y > CONFIG_IP_PIMSM_V1=y > CONFIG_IP_PIMSM_V2=y > CONFIG_SYN_COOKIES=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > CONFIG_INET_DIAG=m > # CONFIG_IPV6 is not set > CONFIG_NETFILTER=y > diff --git a/arch/arm/configs/moxart_defconfig b/arch/arm/configs/moxart_defconfig > index 6a11669..169b861 100644 > --- a/arch/arm/configs/moxart_defconfig > +++ b/arch/arm/configs/moxart_defconfig > @@ -32,9 +32,6 @@ CONFIG_INET=y > CONFIG_IP_MULTICAST=y > CONFIG_IP_PNP=y > CONFIG_IP_PNP_DHCP=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_INET_DIAG is not set > # CONFIG_IPV6 is not set > # CONFIG_WIRELESS is not set > diff --git a/arch/arm/configs/mps2_defconfig b/arch/arm/configs/mps2_defconfig > index 1d923dbb..f2f0416 100644 > --- a/arch/arm/configs/mps2_defconfig > +++ b/arch/arm/configs/mps2_defconfig > @@ -32,9 +32,6 @@ CONFIG_UNIX=y > CONFIG_INET=y > CONFIG_IP_PNP=y > CONFIG_IP_PNP_DHCP=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_INET_DIAG is not set > # CONFIG_IPV6 is not set > # CONFIG_WIRELESS is not set > diff --git a/arch/arm/configs/mxs_defconfig b/arch/arm/configs/mxs_defconfig > index ed570a0..5b55120 100644 > --- a/arch/arm/configs/mxs_defconfig > +++ b/arch/arm/configs/mxs_defconfig > @@ -34,9 +34,6 @@ CONFIG_INET=y > CONFIG_IP_PNP=y > CONFIG_IP_PNP_DHCP=y > CONFIG_SYN_COOKIES=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_INET_DIAG is not set > # CONFIG_IPV6 is not set > CONFIG_CAN=m > diff --git a/arch/arm/configs/omap1_defconfig b/arch/arm/configs/omap1_defconfig > index 82af77c..80f923a 100644 > --- a/arch/arm/configs/omap1_defconfig > +++ b/arch/arm/configs/omap1_defconfig > @@ -68,9 +68,6 @@ CONFIG_IP_MULTICAST=y > CONFIG_IP_PNP=y > CONFIG_IP_PNP_DHCP=y > CONFIG_IP_PNP_BOOTP=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_INET_DIAG is not set > CONFIG_IPV6=y > CONFIG_NETFILTER=y > diff --git a/arch/arm/configs/palmz72_defconfig b/arch/arm/configs/palmz72_defconfig > index e0a6142..1b4a6cf 100644 > --- a/arch/arm/configs/palmz72_defconfig > +++ b/arch/arm/configs/palmz72_defconfig > @@ -26,9 +26,6 @@ CONFIG_UNIX=y > CONFIG_INET=y > CONFIG_IP_PNP=y > CONFIG_IP_PNP_BOOTP=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_IPV6 is not set > CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" > CONFIG_BLK_DEV_LOOP=y > diff --git a/arch/arm/configs/pcm027_defconfig b/arch/arm/configs/pcm027_defconfig > index 9c88a19..9b38b4b 100644 > --- a/arch/arm/configs/pcm027_defconfig > +++ b/arch/arm/configs/pcm027_defconfig > @@ -30,9 +30,6 @@ CONFIG_PACKET=y > CONFIG_UNIX=y > CONFIG_INET=y > CONFIG_IP_PNP=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_INET_DIAG is not set > # CONFIG_IPV6 is not set > CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" > diff --git a/arch/arm/configs/pxa3xx_defconfig b/arch/arm/configs/pxa3xx_defconfig > index 7681eea..794ae4f 100644 > --- a/arch/arm/configs/pxa3xx_defconfig > +++ b/arch/arm/configs/pxa3xx_defconfig > @@ -21,9 +21,6 @@ CONFIG_PACKET=y > CONFIG_UNIX=y > CONFIG_INET=y > CONFIG_IP_PNP=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_INET_DIAG is not set > # CONFIG_IPV6 is not set > CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" > diff --git a/arch/arm/configs/qcom_defconfig b/arch/arm/configs/qcom_defconfig > index c185475..f40bf4b 100644 > --- a/arch/arm/configs/qcom_defconfig > +++ b/arch/arm/configs/qcom_defconfig > @@ -46,9 +46,6 @@ CONFIG_IP_MULTIPLE_TABLES=y > CONFIG_IP_ROUTE_VERBOSE=y > CONFIG_IP_PNP=y > CONFIG_IP_PNP_DHCP=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_IPV6 is not set > CONFIG_CFG80211=m > CONFIG_MAC80211=m > diff --git a/arch/arm/configs/rpc_defconfig b/arch/arm/configs/rpc_defconfig > index 3b82b64..02de1ac 100644 > --- a/arch/arm/configs/rpc_defconfig > +++ b/arch/arm/configs/rpc_defconfig > @@ -17,12 +17,6 @@ CONFIG_PACKET=y > CONFIG_UNIX=y > CONFIG_INET=y > CONFIG_IP_MULTICAST=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > -# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET6_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET6_XFRM_MODE_BEET is not set > CONFIG_PARPORT=y > CONFIG_PARPORT_PC=y > CONFIG_PARPORT_PC_FIFO=y > diff --git a/arch/arm/configs/s3c2410_defconfig b/arch/arm/configs/s3c2410_defconfig > index 39c6485..b3f939f 100644 > --- a/arch/arm/configs/s3c2410_defconfig > +++ b/arch/arm/configs/s3c2410_defconfig > @@ -74,7 +74,6 @@ CONFIG_INET6_AH=m > CONFIG_INET6_ESP=m > CONFIG_INET6_IPCOMP=m > CONFIG_IPV6_MIP6=m > -CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m > CONFIG_IPV6_TUNNEL=m > CONFIG_NETFILTER=y > CONFIG_NF_CONNTRACK=m > diff --git a/arch/arm/configs/sama5_defconfig b/arch/arm/configs/sama5_defconfig > index d5341b0..679a4c7 100644 > --- a/arch/arm/configs/sama5_defconfig > +++ b/arch/arm/configs/sama5_defconfig > @@ -42,13 +42,7 @@ CONFIG_IP_PNP=y > CONFIG_IP_PNP_DHCP=y > CONFIG_IP_PNP_BOOTP=y > CONFIG_IP_PNP_RARP=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_INET_DIAG is not set > -# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET6_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET6_XFRM_MODE_BEET is not set > CONFIG_IPV6_SIT_6RD=y > CONFIG_CAN=y > CONFIG_CAN_AT91=y > diff --git a/arch/arm/configs/sunxi_defconfig b/arch/arm/configs/sunxi_defconfig > index df433ab..c6ce0e4 100644 > --- a/arch/arm/configs/sunxi_defconfig > +++ b/arch/arm/configs/sunxi_defconfig > @@ -24,9 +24,6 @@ CONFIG_INET=y > CONFIG_IP_PNP=y > CONFIG_IP_PNP_DHCP=y > CONFIG_IP_PNP_BOOTP=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_INET_DIAG is not set > # CONFIG_IPV6 is not set > CONFIG_CAN=y > diff --git a/arch/arm/configs/tango4_defconfig b/arch/arm/configs/tango4_defconfig > index 68eb16e..fb80a3a 100644 > --- a/arch/arm/configs/tango4_defconfig > +++ b/arch/arm/configs/tango4_defconfig > @@ -29,9 +29,6 @@ CONFIG_INET=y > CONFIG_IP_MULTICAST=y > CONFIG_IP_PNP=y > CONFIG_IP_PNP_DHCP=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_IPV6 is not set > CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" > CONFIG_DEVTMPFS=y > diff --git a/arch/arm/configs/tegra_defconfig b/arch/arm/configs/tegra_defconfig > index 8f5c6a5..27d4499 100644 > --- a/arch/arm/configs/tegra_defconfig > +++ b/arch/arm/configs/tegra_defconfig > @@ -44,8 +44,6 @@ CONFIG_IP_PNP_DHCP=y > CONFIG_IP_PNP_BOOTP=y > CONFIG_IP_PNP_RARP=y > CONFIG_INET_ESP=y > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_INET_DIAG is not set > CONFIG_IPV6_ROUTER_PREF=y > CONFIG_IPV6_OPTIMISTIC_DAD=y > diff --git a/arch/arm/configs/xcep_defconfig b/arch/arm/configs/xcep_defconfig > index 2eda246..2a2ba7a 100644 > --- a/arch/arm/configs/xcep_defconfig > +++ b/arch/arm/configs/xcep_defconfig > @@ -38,9 +38,6 @@ CONFIG_IP_MULTICAST=y > CONFIG_IP_PNP=y > CONFIG_IP_PNP_DHCP=y > CONFIG_IP_PNP_BOOTP=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_INET_DIAG is not set > # CONFIG_IPV6 is not set > CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" > diff --git a/arch/hexagon/configs/comet_defconfig b/arch/hexagon/configs/comet_defconfig > index e324f65..c35fd25d 100644 > --- a/arch/hexagon/configs/comet_defconfig > +++ b/arch/hexagon/configs/comet_defconfig > @@ -65,9 +65,6 @@ CONFIG_NET=y > CONFIG_PACKET=y > CONFIG_UNIX=y > CONFIG_INET=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_INET_LRO is not set > # CONFIG_INET_DIAG is not set > # CONFIG_IPV6 is not set > diff --git a/arch/m68k/configs/amcore_defconfig b/arch/m68k/configs/amcore_defconfig > index d5e683d..a04cf3e 100644 > --- a/arch/m68k/configs/amcore_defconfig > +++ b/arch/m68k/configs/amcore_defconfig > @@ -28,9 +28,6 @@ CONFIG_PACKET=y > CONFIG_UNIX=y > CONFIG_INET=y > CONFIG_SYN_COOKIES=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_IPV6 is not set > # CONFIG_WIRELESS is not set > # CONFIG_UEVENT_HELPER is not set > diff --git a/arch/m68k/configs/m5208evb_defconfig b/arch/m68k/configs/m5208evb_defconfig > index a3102ff..c3aa6f2 100644 > --- a/arch/m68k/configs/m5208evb_defconfig > +++ b/arch/m68k/configs/m5208evb_defconfig > @@ -23,9 +23,6 @@ CONFIG_NET=y > CONFIG_PACKET=y > CONFIG_UNIX=y > CONFIG_INET=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_INET_DIAG is not set > # CONFIG_IPV6 is not set > # CONFIG_FW_LOADER is not set > diff --git a/arch/m68k/configs/m5249evb_defconfig b/arch/m68k/configs/m5249evb_defconfig > index f7bb9ed..c422e7f 100644 > --- a/arch/m68k/configs/m5249evb_defconfig > +++ b/arch/m68k/configs/m5249evb_defconfig > @@ -24,9 +24,6 @@ CONFIG_NET=y > CONFIG_PACKET=y > CONFIG_UNIX=y > CONFIG_INET=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_INET_DIAG is not set > # CONFIG_IPV6 is not set > # CONFIG_FW_LOADER is not set > diff --git a/arch/m68k/configs/m5272c3_defconfig b/arch/m68k/configs/m5272c3_defconfig > index 1e679f6..3eeb611 100644 > --- a/arch/m68k/configs/m5272c3_defconfig > +++ b/arch/m68k/configs/m5272c3_defconfig > @@ -24,9 +24,6 @@ CONFIG_NET=y > CONFIG_PACKET=y > CONFIG_UNIX=y > CONFIG_INET=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_INET_DIAG is not set > # CONFIG_IPV6 is not set > # CONFIG_FW_LOADER is not set > diff --git a/arch/m68k/configs/m5275evb_defconfig b/arch/m68k/configs/m5275evb_defconfig > index d2987b4..52372ee 100644 > --- a/arch/m68k/configs/m5275evb_defconfig > +++ b/arch/m68k/configs/m5275evb_defconfig > @@ -24,9 +24,6 @@ CONFIG_NET=y > CONFIG_PACKET=y > CONFIG_UNIX=y > CONFIG_INET=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_INET_DIAG is not set > # CONFIG_IPV6 is not set > # CONFIG_FW_LOADER is not set > diff --git a/arch/m68k/configs/m5307c3_defconfig b/arch/m68k/configs/m5307c3_defconfig > index 97a78c9..4efad64 100644 > --- a/arch/m68k/configs/m5307c3_defconfig > +++ b/arch/m68k/configs/m5307c3_defconfig > @@ -24,9 +24,6 @@ CONFIG_NET=y > CONFIG_PACKET=y > CONFIG_UNIX=y > CONFIG_INET=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_INET_DIAG is not set > # CONFIG_IPV6 is not set > # CONFIG_FW_LOADER is not set > diff --git a/arch/m68k/configs/m5407c3_defconfig b/arch/m68k/configs/m5407c3_defconfig > index 766a97f..eecbece1 100644 > --- a/arch/m68k/configs/m5407c3_defconfig > +++ b/arch/m68k/configs/m5407c3_defconfig > @@ -25,9 +25,6 @@ CONFIG_NET=y > CONFIG_PACKET=y > CONFIG_UNIX=y > CONFIG_INET=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_INET_DIAG is not set > # CONFIG_IPV6 is not set > # CONFIG_FW_LOADER is not set > diff --git a/arch/mips/configs/ar7_defconfig b/arch/mips/configs/ar7_defconfig > index c83fdf6..7284102 100644 > --- a/arch/mips/configs/ar7_defconfig > +++ b/arch/mips/configs/ar7_defconfig > @@ -33,9 +33,6 @@ CONFIG_IP_ROUTE_MULTIPATH=y > CONFIG_IP_ROUTE_VERBOSE=y > CONFIG_IP_MROUTE=y > CONFIG_SYN_COOKIES=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_INET_DIAG is not set > CONFIG_TCP_CONG_ADVANCED=y > # CONFIG_TCP_CONG_BIC is not set > diff --git a/arch/mips/configs/ath25_defconfig b/arch/mips/configs/ath25_defconfig > index 5dd6b19..1210f7c 100644 > --- a/arch/mips/configs/ath25_defconfig > +++ b/arch/mips/configs/ath25_defconfig > @@ -30,9 +30,6 @@ CONFIG_UNIX=y > CONFIG_INET=y > CONFIG_IP_MULTICAST=y > CONFIG_IP_ADVANCED_ROUTER=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_IPV6 is not set > CONFIG_CFG80211=m > CONFIG_MAC80211=m > diff --git a/arch/mips/configs/ath79_defconfig b/arch/mips/configs/ath79_defconfig > index 6f981af..f923153 100644 > --- a/arch/mips/configs/ath79_defconfig > +++ b/arch/mips/configs/ath79_defconfig > @@ -30,9 +30,6 @@ CONFIG_UNIX=y > CONFIG_INET=y > CONFIG_IP_MULTICAST=y > CONFIG_IP_ADVANCED_ROUTER=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_IPV6 is not set > CONFIG_CFG80211=m > CONFIG_MAC80211=m > diff --git a/arch/mips/configs/bcm63xx_defconfig b/arch/mips/configs/bcm63xx_defconfig > index d22fe62..3b646b4 100644 > --- a/arch/mips/configs/bcm63xx_defconfig > +++ b/arch/mips/configs/bcm63xx_defconfig > @@ -26,9 +26,6 @@ CONFIG_PCMCIA_BCM63XX=y > CONFIG_NET=y > CONFIG_UNIX=y > CONFIG_INET=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_INET_DIAG is not set > # CONFIG_IPV6 is not set > CONFIG_CFG80211=y > diff --git a/arch/mips/configs/bigsur_defconfig b/arch/mips/configs/bigsur_defconfig > index 597bc0a..215a4b4 100644 > --- a/arch/mips/configs/bigsur_defconfig > +++ b/arch/mips/configs/bigsur_defconfig > @@ -49,8 +49,6 @@ CONFIG_IP_PIMSM_V2=y > CONFIG_INET_AH=m > CONFIG_INET_ESP=m > CONFIG_INET_IPCOMP=m > -CONFIG_INET_XFRM_MODE_TRANSPORT=m > -CONFIG_INET_XFRM_MODE_TUNNEL=m > CONFIG_TCP_MD5SIG=y > CONFIG_IPV6_ROUTER_PREF=y > CONFIG_IPV6_ROUTE_INFO=y > @@ -59,7 +57,6 @@ CONFIG_INET6_AH=m > CONFIG_INET6_ESP=m > CONFIG_INET6_IPCOMP=m > CONFIG_IPV6_MIP6=m > -CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m > CONFIG_IPV6_SIT_6RD=y > CONFIG_IPV6_TUNNEL=m > CONFIG_IPV6_MULTIPLE_TABLES=y > diff --git a/arch/mips/configs/bmips_be_defconfig b/arch/mips/configs/bmips_be_defconfig > index 8a91f01..170c8d2 100644 > --- a/arch/mips/configs/bmips_be_defconfig > +++ b/arch/mips/configs/bmips_be_defconfig > @@ -19,9 +19,6 @@ CONFIG_PACKET=y > CONFIG_PACKET_DIAG=y > CONFIG_UNIX=y > CONFIG_INET=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_INET_DIAG is not set > CONFIG_CFG80211=y > CONFIG_NL80211_TESTMODE=y > diff --git a/arch/mips/configs/bmips_stb_defconfig b/arch/mips/configs/bmips_stb_defconfig > index 39adcca..378b70e 100644 > --- a/arch/mips/configs/bmips_stb_defconfig > +++ b/arch/mips/configs/bmips_stb_defconfig > @@ -28,9 +28,6 @@ CONFIG_PACKET=y > CONFIG_PACKET_DIAG=y > CONFIG_UNIX=y > CONFIG_INET=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_INET_DIAG is not set > CONFIG_CFG80211=y > CONFIG_NL80211_TESTMODE=y > diff --git a/arch/mips/configs/capcella_defconfig b/arch/mips/configs/capcella_defconfig > index 7bf8971..1e51550 100644 > --- a/arch/mips/configs/capcella_defconfig > +++ b/arch/mips/configs/capcella_defconfig > @@ -20,9 +20,6 @@ CONFIG_INET=y > CONFIG_IP_MULTICAST=y > CONFIG_IP_PNP=y > CONFIG_IP_PNP_BOOTP=y > -CONFIG_INET_XFRM_MODE_TRANSPORT=m > -CONFIG_INET_XFRM_MODE_TUNNEL=m > -CONFIG_INET_XFRM_MODE_BEET=m > CONFIG_TCP_MD5SIG=y > # CONFIG_IPV6 is not set > CONFIG_NETWORK_SECMARK=y > diff --git a/arch/mips/configs/ci20_defconfig b/arch/mips/configs/ci20_defconfig > index 50bebce..1c06326 100644 > --- a/arch/mips/configs/ci20_defconfig > +++ b/arch/mips/configs/ci20_defconfig > @@ -38,9 +38,6 @@ CONFIG_UNIX=y > CONFIG_INET=y > CONFIG_IP_PNP=y > CONFIG_IP_PNP_DHCP=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_INET_DIAG is not set > # CONFIG_IPV6 is not set > # CONFIG_WIRELESS is not set > diff --git a/arch/mips/configs/db1xxx_defconfig b/arch/mips/configs/db1xxx_defconfig > index bc9b6ae..f2afc9b 100644 > --- a/arch/mips/configs/db1xxx_defconfig > +++ b/arch/mips/configs/db1xxx_defconfig > @@ -62,7 +62,6 @@ CONFIG_INET6_AH=y > CONFIG_INET6_ESP=y > CONFIG_INET6_IPCOMP=y > CONFIG_IPV6_MIP6=y > -CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=y > CONFIG_IPV6_VTI=y > CONFIG_IPV6_SIT_6RD=y > CONFIG_IPV6_GRE=y > diff --git a/arch/mips/configs/decstation_64_defconfig b/arch/mips/configs/decstation_64_defconfig > index 85f1955..f962d58 100644 > --- a/arch/mips/configs/decstation_64_defconfig > +++ b/arch/mips/configs/decstation_64_defconfig > @@ -37,9 +37,6 @@ CONFIG_SYN_COOKIES=y > CONFIG_INET_AH=m > CONFIG_INET_ESP=m > CONFIG_INET_IPCOMP=m > -CONFIG_INET_XFRM_MODE_TRANSPORT=m > -CONFIG_INET_XFRM_MODE_TUNNEL=m > -CONFIG_INET_XFRM_MODE_BEET=m > CONFIG_TCP_MD5SIG=y > CONFIG_IPV6_ROUTER_PREF=y > CONFIG_IPV6_ROUTE_INFO=y > @@ -47,7 +44,6 @@ CONFIG_INET6_AH=m > CONFIG_INET6_ESP=m > CONFIG_INET6_IPCOMP=m > CONFIG_IPV6_MIP6=m > -CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m > CONFIG_IPV6_MULTIPLE_TABLES=y > CONFIG_IPV6_SUBTREES=y > CONFIG_NETWORK_SECMARK=y > diff --git a/arch/mips/configs/decstation_defconfig b/arch/mips/configs/decstation_defconfig > index 30a6eaf..42f52a7 100644 > --- a/arch/mips/configs/decstation_defconfig > +++ b/arch/mips/configs/decstation_defconfig > @@ -33,9 +33,6 @@ CONFIG_SYN_COOKIES=y > CONFIG_INET_AH=m > CONFIG_INET_ESP=m > CONFIG_INET_IPCOMP=m > -CONFIG_INET_XFRM_MODE_TRANSPORT=m > -CONFIG_INET_XFRM_MODE_TUNNEL=m > -CONFIG_INET_XFRM_MODE_BEET=m > CONFIG_TCP_MD5SIG=y > CONFIG_IPV6_ROUTER_PREF=y > CONFIG_IPV6_ROUTE_INFO=y > @@ -43,7 +40,6 @@ CONFIG_INET6_AH=m > CONFIG_INET6_ESP=m > CONFIG_INET6_IPCOMP=m > CONFIG_IPV6_MIP6=m > -CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m > CONFIG_IPV6_MULTIPLE_TABLES=y > CONFIG_IPV6_SUBTREES=y > CONFIG_NETWORK_SECMARK=y > diff --git a/arch/mips/configs/decstation_r4k_defconfig b/arch/mips/configs/decstation_r4k_defconfig > index e2b58db..6bf3d55 100644 > --- a/arch/mips/configs/decstation_r4k_defconfig > +++ b/arch/mips/configs/decstation_r4k_defconfig > @@ -32,9 +32,6 @@ CONFIG_SYN_COOKIES=y > CONFIG_INET_AH=m > CONFIG_INET_ESP=m > CONFIG_INET_IPCOMP=m > -CONFIG_INET_XFRM_MODE_TRANSPORT=m > -CONFIG_INET_XFRM_MODE_TUNNEL=m > -CONFIG_INET_XFRM_MODE_BEET=m > CONFIG_TCP_MD5SIG=y > CONFIG_IPV6_ROUTER_PREF=y > CONFIG_IPV6_ROUTE_INFO=y > @@ -42,7 +39,6 @@ CONFIG_INET6_AH=m > CONFIG_INET6_ESP=m > CONFIG_INET6_IPCOMP=m > CONFIG_IPV6_MIP6=m > -CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m > CONFIG_IPV6_MULTIPLE_TABLES=y > CONFIG_IPV6_SUBTREES=y > CONFIG_NETWORK_SECMARK=y > diff --git a/arch/mips/configs/fuloong2e_defconfig b/arch/mips/configs/fuloong2e_defconfig > index 8bcb61a..7858f85 100644 > --- a/arch/mips/configs/fuloong2e_defconfig > +++ b/arch/mips/configs/fuloong2e_defconfig > @@ -36,8 +36,6 @@ CONFIG_IP_MULTICAST=y > CONFIG_IP_PNP=y > CONFIG_IP_PNP_BOOTP=y > CONFIG_NET_IPIP=m > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > # CONFIG_INET_DIAG is not set > # CONFIG_IPV6 is not set > CONFIG_NETFILTER=y > diff --git a/arch/mips/configs/gpr_defconfig b/arch/mips/configs/gpr_defconfig > index 9d9af5f..79a537e 100644 > --- a/arch/mips/configs/gpr_defconfig > +++ b/arch/mips/configs/gpr_defconfig > @@ -29,9 +29,6 @@ CONFIG_IP_ROUTE_VERBOSE=y > CONFIG_IP_PNP=y > CONFIG_IP_PNP_BOOTP=y > CONFIG_SYN_COOKIES=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_IPV6 is not set > CONFIG_NETWORK_SECMARK=y > CONFIG_NETFILTER=y > diff --git a/arch/mips/configs/ip22_defconfig b/arch/mips/configs/ip22_defconfig > index 21a1168..e497f68 100644 > --- a/arch/mips/configs/ip22_defconfig > +++ b/arch/mips/configs/ip22_defconfig > @@ -36,9 +36,6 @@ CONFIG_IP_PNP_BOOTP=y > CONFIG_INET_AH=m > CONFIG_INET_ESP=m > CONFIG_INET_IPCOMP=m > -CONFIG_INET_XFRM_MODE_TRANSPORT=m > -CONFIG_INET_XFRM_MODE_TUNNEL=m > -CONFIG_INET_XFRM_MODE_BEET=m > CONFIG_TCP_MD5SIG=y > CONFIG_IPV6_ROUTER_PREF=y > CONFIG_IPV6_ROUTE_INFO=y > @@ -47,7 +44,6 @@ CONFIG_INET6_AH=m > CONFIG_INET6_ESP=m > CONFIG_INET6_IPCOMP=m > CONFIG_IPV6_MIP6=m > -CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m > CONFIG_IPV6_TUNNEL=m > CONFIG_IPV6_MULTIPLE_TABLES=y > CONFIG_IPV6_SUBTREES=y > diff --git a/arch/mips/configs/ip27_defconfig b/arch/mips/configs/ip27_defconfig > index 54db5ded..22bb258 100644 > --- a/arch/mips/configs/ip27_defconfig > +++ b/arch/mips/configs/ip27_defconfig > @@ -33,9 +33,6 @@ CONFIG_NET_KEY_MIGRATE=y > CONFIG_INET=y > CONFIG_IP_MULTICAST=y > CONFIG_IP_PNP=y > -CONFIG_INET_XFRM_MODE_TRANSPORT=m > -CONFIG_INET_XFRM_MODE_TUNNEL=m > -CONFIG_INET_XFRM_MODE_BEET=m > CONFIG_TCP_MD5SIG=y > CONFIG_IPV6_ROUTER_PREF=y > CONFIG_IPV6_ROUTE_INFO=y > @@ -44,10 +41,6 @@ CONFIG_INET6_AH=m > CONFIG_INET6_ESP=m > CONFIG_INET6_IPCOMP=m > CONFIG_IPV6_MIP6=m > -CONFIG_INET6_XFRM_MODE_TRANSPORT=m > -CONFIG_INET6_XFRM_MODE_TUNNEL=m > -CONFIG_INET6_XFRM_MODE_BEET=m > -CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m > CONFIG_IPV6_SIT=m > CONFIG_IPV6_SIT_6RD=y > CONFIG_IPV6_TUNNEL=m > diff --git a/arch/mips/configs/ip28_defconfig b/arch/mips/configs/ip28_defconfig > index 0921ef3..ba13eea 100644 > --- a/arch/mips/configs/ip28_defconfig > +++ b/arch/mips/configs/ip28_defconfig > @@ -29,9 +29,6 @@ CONFIG_IP_MULTICAST=y > CONFIG_IP_PNP=y > CONFIG_IP_PNP_DHCP=y > CONFIG_IP_PNP_BOOTP=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > CONFIG_TCP_MD5SIG=y > # CONFIG_IPV6 is not set > CONFIG_SCSI=y > diff --git a/arch/mips/configs/jazz_defconfig b/arch/mips/configs/jazz_defconfig > index 328d4df..b618dd0 100644 > --- a/arch/mips/configs/jazz_defconfig > +++ b/arch/mips/configs/jazz_defconfig > @@ -26,8 +26,6 @@ CONFIG_NET_IPIP=m > CONFIG_IP_MROUTE=y > CONFIG_IP_PIMSM_V1=y > CONFIG_IP_PIMSM_V2=y > -CONFIG_INET_XFRM_MODE_TRANSPORT=m > -CONFIG_INET_XFRM_MODE_TUNNEL=m > CONFIG_TCP_MD5SIG=y > CONFIG_IPV6_ROUTER_PREF=y > CONFIG_IPV6_ROUTE_INFO=y > diff --git a/arch/mips/configs/jmr3927_defconfig b/arch/mips/configs/jmr3927_defconfig > index 24b96fa..4544548 100644 > --- a/arch/mips/configs/jmr3927_defconfig > +++ b/arch/mips/configs/jmr3927_defconfig > @@ -12,9 +12,6 @@ CONFIG_UNIX=y > CONFIG_INET=y > CONFIG_IP_PNP=y > CONFIG_IP_PNP_BOOTP=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_INET_DIAG is not set > # CONFIG_IPV6 is not set > CONFIG_MTD=y > diff --git a/arch/mips/configs/lasat_defconfig b/arch/mips/configs/lasat_defconfig > index c66ca37..38e6ad0 100644 > --- a/arch/mips/configs/lasat_defconfig > +++ b/arch/mips/configs/lasat_defconfig > @@ -22,9 +22,6 @@ CONFIG_NET=y > CONFIG_PACKET=y > CONFIG_UNIX=y > CONFIG_INET=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_INET_DIAG is not set > # CONFIG_IPV6 is not set > CONFIG_MTD=y > diff --git a/arch/mips/configs/lemote2f_defconfig b/arch/mips/configs/lemote2f_defconfig > index 300127b..cc0822d 100644 > --- a/arch/mips/configs/lemote2f_defconfig > +++ b/arch/mips/configs/lemote2f_defconfig > @@ -44,9 +44,6 @@ CONFIG_IP_MROUTE=y > CONFIG_IP_PIMSM_V1=y > CONFIG_IP_PIMSM_V2=y > CONFIG_SYN_COOKIES=y > -CONFIG_INET_XFRM_MODE_TRANSPORT=m > -CONFIG_INET_XFRM_MODE_TUNNEL=m > -CONFIG_INET_XFRM_MODE_BEET=m > CONFIG_TCP_CONG_ADVANCED=y > CONFIG_TCP_CONG_BIC=y > CONFIG_DEFAULT_BIC=y > diff --git a/arch/mips/configs/loongson1b_defconfig b/arch/mips/configs/loongson1b_defconfig > index 3d390a7..6a50057 100644 > --- a/arch/mips/configs/loongson1b_defconfig > +++ b/arch/mips/configs/loongson1b_defconfig > @@ -28,9 +28,6 @@ CONFIG_INET=y > CONFIG_IP_PNP=y > CONFIG_IP_PNP_DHCP=y > CONFIG_SYN_COOKIES=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_INET_DIAG is not set > # CONFIG_IPV6 is not set > # CONFIG_WIRELESS is not set > diff --git a/arch/mips/configs/loongson1c_defconfig b/arch/mips/configs/loongson1c_defconfig > index 247d56e..c33c727 100644 > --- a/arch/mips/configs/loongson1c_defconfig > +++ b/arch/mips/configs/loongson1c_defconfig > @@ -29,9 +29,6 @@ CONFIG_INET=y > CONFIG_IP_PNP=y > CONFIG_IP_PNP_DHCP=y > CONFIG_SYN_COOKIES=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_INET_DIAG is not set > # CONFIG_IPV6 is not set > # CONFIG_WIRELESS is not set > diff --git a/arch/mips/configs/malta_defconfig b/arch/mips/configs/malta_defconfig > index 0ee5e67..27c7f34 100644 > --- a/arch/mips/configs/malta_defconfig > +++ b/arch/mips/configs/malta_defconfig > @@ -41,8 +41,6 @@ CONFIG_SYN_COOKIES=y > CONFIG_INET_AH=m > CONFIG_INET_ESP=m > CONFIG_INET_IPCOMP=m > -CONFIG_INET_XFRM_MODE_TRANSPORT=m > -CONFIG_INET_XFRM_MODE_TUNNEL=m > CONFIG_TCP_MD5SIG=y > CONFIG_IPV6_ROUTER_PREF=y > CONFIG_IPV6_ROUTE_INFO=y > diff --git a/arch/mips/configs/malta_kvm_defconfig b/arch/mips/configs/malta_kvm_defconfig > index 041bffa..dc4bb60 100644 > --- a/arch/mips/configs/malta_kvm_defconfig > +++ b/arch/mips/configs/malta_kvm_defconfig > @@ -46,8 +46,6 @@ CONFIG_SYN_COOKIES=y > CONFIG_INET_AH=m > CONFIG_INET_ESP=m > CONFIG_INET_IPCOMP=m > -CONFIG_INET_XFRM_MODE_TRANSPORT=m > -CONFIG_INET_XFRM_MODE_TUNNEL=m > CONFIG_TCP_MD5SIG=y > CONFIG_IPV6_ROUTER_PREF=y > CONFIG_IPV6_ROUTE_INFO=y > diff --git a/arch/mips/configs/malta_kvm_guest_defconfig b/arch/mips/configs/malta_kvm_guest_defconfig > index 511065e..8304d34 100644 > --- a/arch/mips/configs/malta_kvm_guest_defconfig > +++ b/arch/mips/configs/malta_kvm_guest_defconfig > @@ -43,8 +43,6 @@ CONFIG_SYN_COOKIES=y > CONFIG_INET_AH=m > CONFIG_INET_ESP=m > CONFIG_INET_IPCOMP=m > -CONFIG_INET_XFRM_MODE_TRANSPORT=m > -CONFIG_INET_XFRM_MODE_TUNNEL=m > CONFIG_TCP_MD5SIG=y > CONFIG_IPV6_ROUTER_PREF=y > CONFIG_IPV6_ROUTE_INFO=y > diff --git a/arch/mips/configs/maltaup_xpa_defconfig b/arch/mips/configs/maltaup_xpa_defconfig > index 6c026db..8ba7ae4 100644 > --- a/arch/mips/configs/maltaup_xpa_defconfig > +++ b/arch/mips/configs/maltaup_xpa_defconfig > @@ -45,8 +45,6 @@ CONFIG_SYN_COOKIES=y > CONFIG_INET_AH=m > CONFIG_INET_ESP=m > CONFIG_INET_IPCOMP=m > -CONFIG_INET_XFRM_MODE_TRANSPORT=m > -CONFIG_INET_XFRM_MODE_TUNNEL=m > CONFIG_TCP_MD5SIG=y > CONFIG_IPV6_ROUTER_PREF=y > CONFIG_IPV6_ROUTE_INFO=y > diff --git a/arch/mips/configs/markeins_defconfig b/arch/mips/configs/markeins_defconfig > index ae93a94..d0d5b5d 100644 > --- a/arch/mips/configs/markeins_defconfig > +++ b/arch/mips/configs/markeins_defconfig > @@ -28,12 +28,8 @@ CONFIG_IP_ROUTE_VERBOSE=y > CONFIG_IP_PNP=y > CONFIG_IP_PNP_BOOTP=y > CONFIG_SYN_COOKIES=y > -CONFIG_INET_XFRM_MODE_TRANSPORT=m > -CONFIG_INET_XFRM_MODE_TUNNEL=m > -CONFIG_INET_XFRM_MODE_BEET=m > CONFIG_TCP_MD5SIG=y > CONFIG_IPV6_MIP6=m > -CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m > CONFIG_IPV6_MULTIPLE_TABLES=y > CONFIG_IPV6_SUBTREES=y > CONFIG_NETWORK_SECMARK=y > diff --git a/arch/mips/configs/mpc30x_defconfig b/arch/mips/configs/mpc30x_defconfig > index d4e0388..1de4daa 100644 > --- a/arch/mips/configs/mpc30x_defconfig > +++ b/arch/mips/configs/mpc30x_defconfig > @@ -18,9 +18,6 @@ CONFIG_NET_KEY=y > CONFIG_NET_KEY_MIGRATE=y > CONFIG_INET=y > CONFIG_IP_MULTICAST=y > -CONFIG_INET_XFRM_MODE_TRANSPORT=m > -CONFIG_INET_XFRM_MODE_TUNNEL=m > -CONFIG_INET_XFRM_MODE_BEET=m > # CONFIG_IPV6 is not set > CONFIG_NETWORK_SECMARK=y > CONFIG_CONNECTOR=m > diff --git a/arch/mips/configs/mtx1_defconfig b/arch/mips/configs/mtx1_defconfig > index 16bef81..0ff94be 100644 > --- a/arch/mips/configs/mtx1_defconfig > +++ b/arch/mips/configs/mtx1_defconfig > @@ -59,13 +59,9 @@ CONFIG_SYN_COOKIES=y > CONFIG_INET_AH=m > CONFIG_INET_ESP=m > CONFIG_INET_IPCOMP=m > -CONFIG_INET_XFRM_MODE_TRANSPORT=m > -CONFIG_INET_XFRM_MODE_TUNNEL=m > -CONFIG_INET_XFRM_MODE_BEET=m > CONFIG_INET6_AH=m > CONFIG_INET6_ESP=m > CONFIG_INET6_IPCOMP=m > -CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m > CONFIG_IPV6_TUNNEL=m > CONFIG_NETWORK_SECMARK=y > CONFIG_NETFILTER=y > diff --git a/arch/mips/configs/nlm_xlp_defconfig b/arch/mips/configs/nlm_xlp_defconfig > index 72a211d..5372430 100644 > --- a/arch/mips/configs/nlm_xlp_defconfig > +++ b/arch/mips/configs/nlm_xlp_defconfig > @@ -76,9 +76,6 @@ CONFIG_SYN_COOKIES=y > CONFIG_INET_AH=m > CONFIG_INET_ESP=m > CONFIG_INET_IPCOMP=m > -CONFIG_INET_XFRM_MODE_TRANSPORT=m > -CONFIG_INET_XFRM_MODE_TUNNEL=m > -CONFIG_INET_XFRM_MODE_BEET=m > CONFIG_TCP_CONG_ADVANCED=y > CONFIG_TCP_CONG_HSTCP=m > CONFIG_TCP_CONG_HYBLA=m > @@ -91,10 +88,6 @@ CONFIG_TCP_MD5SIG=y > CONFIG_INET6_AH=m > CONFIG_INET6_ESP=m > CONFIG_INET6_IPCOMP=m > -CONFIG_INET6_XFRM_MODE_TRANSPORT=m > -CONFIG_INET6_XFRM_MODE_TUNNEL=m > -CONFIG_INET6_XFRM_MODE_BEET=m > -CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m > CONFIG_IPV6_SIT=m > CONFIG_IPV6_TUNNEL=m > CONFIG_IPV6_MULTIPLE_TABLES=y > diff --git a/arch/mips/configs/nlm_xlr_defconfig b/arch/mips/configs/nlm_xlr_defconfig > index 4ecb157..41feef7 100644 > --- a/arch/mips/configs/nlm_xlr_defconfig > +++ b/arch/mips/configs/nlm_xlr_defconfig > @@ -74,9 +74,6 @@ CONFIG_SYN_COOKIES=y > CONFIG_INET_AH=m > CONFIG_INET_ESP=m > CONFIG_INET_IPCOMP=m > -CONFIG_INET_XFRM_MODE_TRANSPORT=m > -CONFIG_INET_XFRM_MODE_TUNNEL=m > -CONFIG_INET_XFRM_MODE_BEET=m > CONFIG_TCP_CONG_ADVANCED=y > CONFIG_TCP_CONG_HSTCP=m > CONFIG_TCP_CONG_HYBLA=m > @@ -89,10 +86,6 @@ CONFIG_TCP_MD5SIG=y > CONFIG_INET6_AH=m > CONFIG_INET6_ESP=m > CONFIG_INET6_IPCOMP=m > -CONFIG_INET6_XFRM_MODE_TRANSPORT=m > -CONFIG_INET6_XFRM_MODE_TUNNEL=m > -CONFIG_INET6_XFRM_MODE_BEET=m > -CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m > CONFIG_IPV6_SIT=m > CONFIG_IPV6_TUNNEL=m > CONFIG_IPV6_MULTIPLE_TABLES=y > diff --git a/arch/mips/configs/omega2p_defconfig b/arch/mips/configs/omega2p_defconfig > index 0649b8f..5850c00 100644 > --- a/arch/mips/configs/omega2p_defconfig > +++ b/arch/mips/configs/omega2p_defconfig > @@ -36,9 +36,6 @@ CONFIG_NET=y > CONFIG_PACKET=y > CONFIG_UNIX=y > CONFIG_INET=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_INET_DIAG is not set > # CONFIG_IPV6 is not set > # CONFIG_WIRELESS is not set > diff --git a/arch/mips/configs/pistachio_defconfig b/arch/mips/configs/pistachio_defconfig > index 2f08d07..b649c84 100644 > --- a/arch/mips/configs/pistachio_defconfig > +++ b/arch/mips/configs/pistachio_defconfig > @@ -55,9 +55,6 @@ CONFIG_SYN_COOKIES=y > CONFIG_INET_AH=m > CONFIG_INET_ESP=m > CONFIG_INET_IPCOMP=m > -CONFIG_INET_XFRM_MODE_TRANSPORT=m > -CONFIG_INET_XFRM_MODE_TUNNEL=m > -CONFIG_INET_XFRM_MODE_BEET=m > # CONFIG_INET_DIAG is not set > CONFIG_TCP_CONG_ADVANCED=y > # CONFIG_TCP_CONG_BIC is not set > @@ -67,9 +64,6 @@ CONFIG_TCP_CONG_LP=m > CONFIG_TCP_MD5SIG=y > CONFIG_INET6_AH=m > CONFIG_INET6_ESP=m > -CONFIG_INET6_XFRM_MODE_TRANSPORT=m > -CONFIG_INET6_XFRM_MODE_TUNNEL=m > -CONFIG_INET6_XFRM_MODE_BEET=m > CONFIG_IPV6_SIT=m > CONFIG_NETWORK_SECMARK=y > CONFIG_NETFILTER=y > diff --git a/arch/mips/configs/qi_lb60_defconfig b/arch/mips/configs/qi_lb60_defconfig > index 1a0677d..dbf1415 100644 > --- a/arch/mips/configs/qi_lb60_defconfig > +++ b/arch/mips/configs/qi_lb60_defconfig > @@ -31,9 +31,6 @@ CONFIG_IP_ROUTE_MULTIPATH=y > CONFIG_IP_ROUTE_VERBOSE=y > CONFIG_IP_MROUTE=y > CONFIG_IP_MROUTE_MULTIPLE_TABLES=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_INET_DIAG is not set > CONFIG_TCP_CONG_ADVANCED=y > # CONFIG_TCP_CONG_BIC is not set > diff --git a/arch/mips/configs/rb532_defconfig b/arch/mips/configs/rb532_defconfig > index 50632a3..1e6cde1 100644 > --- a/arch/mips/configs/rb532_defconfig > +++ b/arch/mips/configs/rb532_defconfig > @@ -34,9 +34,6 @@ CONFIG_IP_MULTIPLE_TABLES=y > CONFIG_IP_ROUTE_MULTIPATH=y > CONFIG_IP_ROUTE_VERBOSE=y > CONFIG_SYN_COOKIES=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > CONFIG_INET_DIAG=m > CONFIG_TCP_CONG_ADVANCED=y > CONFIG_TCP_CONG_CUBIC=m > diff --git a/arch/mips/configs/rbtx49xx_defconfig b/arch/mips/configs/rbtx49xx_defconfig > index 5e389db..df64253 100644 > --- a/arch/mips/configs/rbtx49xx_defconfig > +++ b/arch/mips/configs/rbtx49xx_defconfig > @@ -24,9 +24,6 @@ CONFIG_UNIX=y > CONFIG_INET=y > CONFIG_IP_MULTICAST=y > CONFIG_IP_PNP=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_IPV6 is not set > # CONFIG_WIRELESS is not set > CONFIG_MTD=y > diff --git a/arch/mips/configs/rm200_defconfig b/arch/mips/configs/rm200_defconfig > index 0f4b09f..82f24a8 100644 > --- a/arch/mips/configs/rm200_defconfig > +++ b/arch/mips/configs/rm200_defconfig > @@ -29,9 +29,6 @@ CONFIG_NET_IPIP=m > CONFIG_IP_MROUTE=y > CONFIG_IP_PIMSM_V1=y > CONFIG_IP_PIMSM_V2=y > -CONFIG_INET_XFRM_MODE_TRANSPORT=m > -CONFIG_INET_XFRM_MODE_TUNNEL=m > -CONFIG_INET_XFRM_MODE_BEET=m > CONFIG_TCP_MD5SIG=y > CONFIG_IPV6_ROUTER_PREF=y > CONFIG_IPV6_ROUTE_INFO=y > @@ -39,7 +36,6 @@ CONFIG_INET6_AH=m > CONFIG_INET6_ESP=m > CONFIG_INET6_IPCOMP=m > CONFIG_IPV6_MIP6=m > -CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m > CONFIG_IPV6_TUNNEL=m > CONFIG_IPV6_MULTIPLE_TABLES=y > CONFIG_IPV6_SUBTREES=y > diff --git a/arch/mips/configs/rt305x_defconfig b/arch/mips/configs/rt305x_defconfig > index 0392e38..efa0859 100644 > --- a/arch/mips/configs/rt305x_defconfig > +++ b/arch/mips/configs/rt305x_defconfig > @@ -36,9 +36,6 @@ CONFIG_IP_ROUTE_VERBOSE=y > CONFIG_IP_MROUTE=y > CONFIG_IP_MROUTE_MULTIPLE_TABLES=y > CONFIG_SYN_COOKIES=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_INET_DIAG is not set > CONFIG_TCP_CONG_ADVANCED=y > # CONFIG_TCP_CONG_BIC is not set > diff --git a/arch/mips/configs/sb1250_swarm_defconfig b/arch/mips/configs/sb1250_swarm_defconfig > index ad89816..4b74201 100644 > --- a/arch/mips/configs/sb1250_swarm_defconfig > +++ b/arch/mips/configs/sb1250_swarm_defconfig > @@ -34,9 +34,6 @@ CONFIG_INET=y > CONFIG_IP_PNP=y > CONFIG_IP_PNP_DHCP=y > CONFIG_IP_PNP_BOOTP=y > -CONFIG_INET_XFRM_MODE_TRANSPORT=m > -CONFIG_INET_XFRM_MODE_TUNNEL=m > -CONFIG_INET_XFRM_MODE_BEET=m > CONFIG_TCP_MD5SIG=y > # CONFIG_IPV6 is not set > CONFIG_NETWORK_SECMARK=y > diff --git a/arch/mips/configs/tb0219_defconfig b/arch/mips/configs/tb0219_defconfig > index f0a11a7..b835acb 100644 > --- a/arch/mips/configs/tb0219_defconfig > +++ b/arch/mips/configs/tb0219_defconfig > @@ -23,9 +23,6 @@ CONFIG_IP_PNP=y > CONFIG_IP_PNP_BOOTP=y > CONFIG_NET_IPIP=m > CONFIG_SYN_COOKIES=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_IPV6 is not set > CONFIG_NETWORK_SECMARK=y > CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" > diff --git a/arch/mips/configs/tb0226_defconfig b/arch/mips/configs/tb0226_defconfig > index 025e456..da2f46a 100644 > --- a/arch/mips/configs/tb0226_defconfig > +++ b/arch/mips/configs/tb0226_defconfig > @@ -21,9 +21,6 @@ CONFIG_IP_ROUTE_VERBOSE=y > CONFIG_IP_PNP=y > CONFIG_IP_PNP_BOOTP=y > CONFIG_SYN_COOKIES=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_IPV6 is not set > CONFIG_NETWORK_SECMARK=y > CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" > diff --git a/arch/mips/configs/tb0287_defconfig b/arch/mips/configs/tb0287_defconfig > index 6849024..9eb4626 100644 > --- a/arch/mips/configs/tb0287_defconfig > +++ b/arch/mips/configs/tb0287_defconfig > @@ -22,9 +22,6 @@ CONFIG_IP_PNP=y > CONFIG_IP_PNP_BOOTP=y > CONFIG_NET_IPIP=m > CONFIG_SYN_COOKIES=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > CONFIG_TCP_CONG_ADVANCED=y > CONFIG_TCP_CONG_BIC=y > CONFIG_TCP_CONG_CUBIC=m > diff --git a/arch/mips/configs/vocore2_defconfig b/arch/mips/configs/vocore2_defconfig > index ded3dce..e7dc5c4 100644 > --- a/arch/mips/configs/vocore2_defconfig > +++ b/arch/mips/configs/vocore2_defconfig > @@ -36,9 +36,6 @@ CONFIG_NET=y > CONFIG_PACKET=y > CONFIG_UNIX=y > CONFIG_INET=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_INET_DIAG is not set > # CONFIG_IPV6 is not set > # CONFIG_WIRELESS is not set > diff --git a/arch/mips/configs/workpad_defconfig b/arch/mips/configs/workpad_defconfig > index 891a5f7..520ee46 100644 > --- a/arch/mips/configs/workpad_defconfig > +++ b/arch/mips/configs/workpad_defconfig > @@ -20,9 +20,6 @@ CONFIG_NET_KEY=y > CONFIG_NET_KEY_MIGRATE=y > CONFIG_INET=y > CONFIG_IP_MULTICAST=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_IPV6 is not set > CONFIG_NETWORK_SECMARK=y > CONFIG_BLK_DEV_RAM=m > diff --git a/arch/mips/configs/xway_defconfig b/arch/mips/configs/xway_defconfig > index 203db83..c022091 100644 > --- a/arch/mips/configs/xway_defconfig > +++ b/arch/mips/configs/xway_defconfig > @@ -38,9 +38,6 @@ CONFIG_IP_ROUTE_VERBOSE=y > CONFIG_IP_MROUTE=y > CONFIG_IP_MROUTE_MULTIPLE_TABLES=y > CONFIG_SYN_COOKIES=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_INET_DIAG is not set > CONFIG_TCP_CONG_ADVANCED=y > # CONFIG_TCP_CONG_BIC is not set > diff --git a/arch/nios2/configs/10m50_defconfig b/arch/nios2/configs/10m50_defconfig > index 7977ab7..112f7ae 100644 > --- a/arch/nios2/configs/10m50_defconfig > +++ b/arch/nios2/configs/10m50_defconfig > @@ -30,9 +30,6 @@ CONFIG_IP_PNP=y > CONFIG_IP_PNP_DHCP=y > CONFIG_IP_PNP_BOOTP=y > CONFIG_IP_PNP_RARP=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_IPV6 is not set > # CONFIG_WIRELESS is not set > CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" > diff --git a/arch/nios2/configs/3c120_defconfig b/arch/nios2/configs/3c120_defconfig > index ceb97cd..30524d8 100644 > --- a/arch/nios2/configs/3c120_defconfig > +++ b/arch/nios2/configs/3c120_defconfig > @@ -32,9 +32,6 @@ CONFIG_IP_PNP=y > CONFIG_IP_PNP_DHCP=y > CONFIG_IP_PNP_BOOTP=y > CONFIG_IP_PNP_RARP=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_IPV6 is not set > # CONFIG_WIRELESS is not set > CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" > diff --git a/arch/openrisc/configs/or1ksim_defconfig b/arch/openrisc/configs/or1ksim_defconfig > index d8ff4f8..c8d67a3 100644 > --- a/arch/openrisc/configs/or1ksim_defconfig > +++ b/arch/openrisc/configs/or1ksim_defconfig > @@ -20,9 +20,6 @@ CONFIG_NET=y > CONFIG_PACKET=y > CONFIG_UNIX=y > CONFIG_INET=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_INET_DIAG is not set > CONFIG_TCP_CONG_ADVANCED=y > # CONFIG_TCP_CONG_BIC is not set > diff --git a/arch/openrisc/configs/simple_smp_defconfig b/arch/openrisc/configs/simple_smp_defconfig > index 6427899..8fe55ce 100644 > --- a/arch/openrisc/configs/simple_smp_defconfig > +++ b/arch/openrisc/configs/simple_smp_defconfig > @@ -28,9 +28,6 @@ CONFIG_NET=y > CONFIG_PACKET=y > CONFIG_UNIX=y > CONFIG_INET=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_INET_DIAG is not set > CONFIG_TCP_CONG_ADVANCED=y > # CONFIG_TCP_CONG_BIC is not set > diff --git a/arch/parisc/configs/c8000_defconfig b/arch/parisc/configs/c8000_defconfig > index 507f064..2b543ee 100644 > --- a/arch/parisc/configs/c8000_defconfig > +++ b/arch/parisc/configs/c8000_defconfig > @@ -49,7 +49,6 @@ CONFIG_SYN_COOKIES=y > CONFIG_INET_AH=m > CONFIG_INET_ESP=m > CONFIG_INET_IPCOMP=m > -CONFIG_INET_XFRM_MODE_BEET=m > CONFIG_INET_DIAG=m > # CONFIG_IPV6 is not set > CONFIG_IP_DCCP=m > diff --git a/arch/parisc/configs/generic-32bit_defconfig b/arch/parisc/configs/generic-32bit_defconfig > index 18b072a..632ca1a 100644 > --- a/arch/parisc/configs/generic-32bit_defconfig > +++ b/arch/parisc/configs/generic-32bit_defconfig > @@ -41,9 +41,6 @@ CONFIG_IP_PNP=y > CONFIG_IP_PNP_BOOTP=y > CONFIG_INET_AH=m > CONFIG_INET_ESP=m > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > CONFIG_INET_DIAG=m > CONFIG_LLC2=m > # CONFIG_WIRELESS is not set > diff --git a/arch/parisc/configs/generic-64bit_defconfig b/arch/parisc/configs/generic-64bit_defconfig > index d39e7f8..8ed7043 100644 > --- a/arch/parisc/configs/generic-64bit_defconfig > +++ b/arch/parisc/configs/generic-64bit_defconfig > @@ -50,9 +50,6 @@ CONFIG_IP_PNP=y > CONFIG_IP_PNP_BOOTP=y > CONFIG_INET_AH=m > CONFIG_INET_ESP=m > -CONFIG_INET_XFRM_MODE_TRANSPORT=m > -CONFIG_INET_XFRM_MODE_TUNNEL=m > -CONFIG_INET_XFRM_MODE_BEET=m > CONFIG_INET_DIAG=m > CONFIG_NETFILTER=y > # CONFIG_NETFILTER_ADVANCED is not set > diff --git a/arch/powerpc/configs/40x/acadia_defconfig b/arch/powerpc/configs/40x/acadia_defconfig > index e57344c..58b07f8 100644 > --- a/arch/powerpc/configs/40x/acadia_defconfig > +++ b/arch/powerpc/configs/40x/acadia_defconfig > @@ -18,9 +18,6 @@ CONFIG_INET=y > CONFIG_IP_PNP=y > CONFIG_IP_PNP_DHCP=y > CONFIG_IP_PNP_BOOTP=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_IPV6 is not set > CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" > CONFIG_CONNECTOR=y > diff --git a/arch/powerpc/configs/40x/ep405_defconfig b/arch/powerpc/configs/40x/ep405_defconfig > index 0f66f8a..164ec2d 100644 > --- a/arch/powerpc/configs/40x/ep405_defconfig > +++ b/arch/powerpc/configs/40x/ep405_defconfig > @@ -17,9 +17,6 @@ CONFIG_INET=y > CONFIG_IP_PNP=y > CONFIG_IP_PNP_DHCP=y > CONFIG_IP_PNP_BOOTP=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_IPV6 is not set > CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" > CONFIG_CONNECTOR=y > diff --git a/arch/powerpc/configs/40x/kilauea_defconfig b/arch/powerpc/configs/40x/kilauea_defconfig > index 3da091f..003bc3c 100644 > --- a/arch/powerpc/configs/40x/kilauea_defconfig > +++ b/arch/powerpc/configs/40x/kilauea_defconfig > @@ -20,9 +20,6 @@ CONFIG_INET=y > CONFIG_IP_PNP=y > CONFIG_IP_PNP_DHCP=y > CONFIG_IP_PNP_BOOTP=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_IPV6 is not set > CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" > CONFIG_CONNECTOR=y > diff --git a/arch/powerpc/configs/40x/makalu_defconfig b/arch/powerpc/configs/40x/makalu_defconfig > index e0b1489..0ab2b58 100644 > --- a/arch/powerpc/configs/40x/makalu_defconfig > +++ b/arch/powerpc/configs/40x/makalu_defconfig > @@ -17,9 +17,6 @@ CONFIG_INET=y > CONFIG_IP_PNP=y > CONFIG_IP_PNP_DHCP=y > CONFIG_IP_PNP_BOOTP=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_IPV6 is not set > CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" > CONFIG_CONNECTOR=y > diff --git a/arch/powerpc/configs/40x/obs600_defconfig b/arch/powerpc/configs/40x/obs600_defconfig > index 38d3d77..a5eea76 100644 > --- a/arch/powerpc/configs/40x/obs600_defconfig > +++ b/arch/powerpc/configs/40x/obs600_defconfig > @@ -20,9 +20,6 @@ CONFIG_INET=y > CONFIG_IP_PNP=y > CONFIG_IP_PNP_DHCP=y > CONFIG_IP_PNP_BOOTP=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_IPV6 is not set > CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" > CONFIG_CONNECTOR=y > diff --git a/arch/powerpc/configs/40x/walnut_defconfig b/arch/powerpc/configs/40x/walnut_defconfig > index 6faa03c..935cb3c 100644 > --- a/arch/powerpc/configs/40x/walnut_defconfig > +++ b/arch/powerpc/configs/40x/walnut_defconfig > @@ -15,9 +15,6 @@ CONFIG_INET=y > CONFIG_IP_PNP=y > CONFIG_IP_PNP_DHCP=y > CONFIG_IP_PNP_BOOTP=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_IPV6 is not set > CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" > CONFIG_CONNECTOR=y > diff --git a/arch/powerpc/configs/44x/akebono_defconfig b/arch/powerpc/configs/44x/akebono_defconfig > index 9fcd361..a1879e4 100644 > --- a/arch/powerpc/configs/44x/akebono_defconfig > +++ b/arch/powerpc/configs/44x/akebono_defconfig > @@ -29,9 +29,6 @@ CONFIG_INET=y > CONFIG_IP_PNP=y > CONFIG_IP_PNP_DHCP=y > CONFIG_IP_PNP_BOOTP=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_IPV6 is not set > CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" > CONFIG_DEVTMPFS=y > diff --git a/arch/powerpc/configs/44x/arches_defconfig b/arch/powerpc/configs/44x/arches_defconfig > index 6bba1a5..f66fe97 100644 > --- a/arch/powerpc/configs/44x/arches_defconfig > +++ b/arch/powerpc/configs/44x/arches_defconfig > @@ -20,9 +20,6 @@ CONFIG_INET=y > CONFIG_IP_PNP=y > CONFIG_IP_PNP_DHCP=y > CONFIG_IP_PNP_BOOTP=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_IPV6 is not set > CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" > CONFIG_CONNECTOR=y > diff --git a/arch/powerpc/configs/44x/bamboo_defconfig b/arch/powerpc/configs/44x/bamboo_defconfig > index 6f3a6ec..c4cc678 100644 > --- a/arch/powerpc/configs/44x/bamboo_defconfig > +++ b/arch/powerpc/configs/44x/bamboo_defconfig > @@ -18,9 +18,6 @@ CONFIG_INET=y > CONFIG_IP_PNP=y > CONFIG_IP_PNP_DHCP=y > CONFIG_IP_PNP_BOOTP=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_IPV6 is not set > CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" > CONFIG_CONNECTOR=y > diff --git a/arch/powerpc/configs/44x/canyonlands_defconfig b/arch/powerpc/configs/44x/canyonlands_defconfig > index d427cee..70eeb26 100644 > --- a/arch/powerpc/configs/44x/canyonlands_defconfig > +++ b/arch/powerpc/configs/44x/canyonlands_defconfig > @@ -20,9 +20,6 @@ CONFIG_INET=y > CONFIG_IP_PNP=y > CONFIG_IP_PNP_DHCP=y > CONFIG_IP_PNP_BOOTP=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_IPV6 is not set > CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" > CONFIG_CONNECTOR=y > diff --git a/arch/powerpc/configs/44x/currituck_defconfig b/arch/powerpc/configs/44x/currituck_defconfig > index 5f1df5f..74f1432b5 100644 > --- a/arch/powerpc/configs/44x/currituck_defconfig > +++ b/arch/powerpc/configs/44x/currituck_defconfig > @@ -27,9 +27,6 @@ CONFIG_INET=y > CONFIG_IP_PNP=y > CONFIG_IP_PNP_DHCP=y > CONFIG_IP_PNP_BOOTP=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_IPV6 is not set > CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" > CONFIG_DEVTMPFS=y > diff --git a/arch/powerpc/configs/44x/ebony_defconfig b/arch/powerpc/configs/44x/ebony_defconfig > index e2b6578..ce6d213 100644 > --- a/arch/powerpc/configs/44x/ebony_defconfig > +++ b/arch/powerpc/configs/44x/ebony_defconfig > @@ -16,9 +16,6 @@ CONFIG_INET=y > CONFIG_IP_PNP=y > CONFIG_IP_PNP_DHCP=y > CONFIG_IP_PNP_BOOTP=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_IPV6 is not set > CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" > CONFIG_CONNECTOR=y > diff --git a/arch/powerpc/configs/44x/eiger_defconfig b/arch/powerpc/configs/44x/eiger_defconfig > index f593258..b8ebe34 100644 > --- a/arch/powerpc/configs/44x/eiger_defconfig > +++ b/arch/powerpc/configs/44x/eiger_defconfig > @@ -21,9 +21,6 @@ CONFIG_INET=y > CONFIG_IP_PNP=y > CONFIG_IP_PNP_DHCP=y > CONFIG_IP_PNP_BOOTP=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_IPV6 is not set > CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" > CONFIG_CONNECTOR=y > diff --git a/arch/powerpc/configs/44x/fsp2_defconfig b/arch/powerpc/configs/44x/fsp2_defconfig > index bae6b26..65c65b9 100644 > --- a/arch/powerpc/configs/44x/fsp2_defconfig > +++ b/arch/powerpc/configs/44x/fsp2_defconfig > @@ -39,9 +39,6 @@ CONFIG_INET=y > CONFIG_IP_PNP=y > CONFIG_IP_PNP_DHCP=y > CONFIG_IP_PNP_BOOTP=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_IPV6 is not set > CONFIG_VLAN_8021Q=m > CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" > diff --git a/arch/powerpc/configs/44x/icon_defconfig b/arch/powerpc/configs/44x/icon_defconfig > index 4453a45..b638247 100644 > --- a/arch/powerpc/configs/44x/icon_defconfig > +++ b/arch/powerpc/configs/44x/icon_defconfig > @@ -20,9 +20,6 @@ CONFIG_INET=y > CONFIG_IP_PNP=y > CONFIG_IP_PNP_DHCP=y > CONFIG_IP_PNP_BOOTP=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_IPV6 is not set > CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" > CONFIG_CONNECTOR=y > diff --git a/arch/powerpc/configs/44x/iss476-smp_defconfig b/arch/powerpc/configs/44x/iss476-smp_defconfig > index d24bfa6..166d7cd 100644 > --- a/arch/powerpc/configs/44x/iss476-smp_defconfig > +++ b/arch/powerpc/configs/44x/iss476-smp_defconfig > @@ -29,9 +29,6 @@ CONFIG_INET=y > CONFIG_IP_PNP=y > CONFIG_IP_PNP_DHCP=y > CONFIG_IP_PNP_BOOTP=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_IPV6 is not set > CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" > CONFIG_CONNECTOR=y > diff --git a/arch/powerpc/configs/44x/katmai_defconfig b/arch/powerpc/configs/44x/katmai_defconfig > index 5d3f685..d78ad46 100644 > --- a/arch/powerpc/configs/44x/katmai_defconfig > +++ b/arch/powerpc/configs/44x/katmai_defconfig > @@ -18,9 +18,6 @@ CONFIG_INET=y > CONFIG_IP_PNP=y > CONFIG_IP_PNP_DHCP=y > CONFIG_IP_PNP_BOOTP=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_IPV6 is not set > CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" > CONFIG_CONNECTOR=y > diff --git a/arch/powerpc/configs/44x/rainier_defconfig b/arch/powerpc/configs/44x/rainier_defconfig > index 7b8355a..f02b2a6 100644 > --- a/arch/powerpc/configs/44x/rainier_defconfig > +++ b/arch/powerpc/configs/44x/rainier_defconfig > @@ -19,9 +19,6 @@ CONFIG_INET=y > CONFIG_IP_PNP=y > CONFIG_IP_PNP_DHCP=y > CONFIG_IP_PNP_BOOTP=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_IPV6 is not set > CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" > CONFIG_CONNECTOR=y > diff --git a/arch/powerpc/configs/44x/redwood_defconfig b/arch/powerpc/configs/44x/redwood_defconfig > index 918cfb6..4131804 100644 > --- a/arch/powerpc/configs/44x/redwood_defconfig > +++ b/arch/powerpc/configs/44x/redwood_defconfig > @@ -21,9 +21,6 @@ CONFIG_INET=y > CONFIG_IP_PNP=y > CONFIG_IP_PNP_DHCP=y > CONFIG_IP_PNP_BOOTP=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_IPV6 is not set > CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" > CONFIG_CONNECTOR=y > diff --git a/arch/powerpc/configs/44x/sam440ep_defconfig b/arch/powerpc/configs/44x/sam440ep_defconfig > index 63302fb..399cff3 100644 > --- a/arch/powerpc/configs/44x/sam440ep_defconfig > +++ b/arch/powerpc/configs/44x/sam440ep_defconfig > @@ -23,9 +23,6 @@ CONFIG_INET=y > CONFIG_IP_PNP=y > CONFIG_IP_PNP_DHCP=y > CONFIG_IP_PNP_BOOTP=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_IPV6 is not set > CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" > CONFIG_CONNECTOR=y > diff --git a/arch/powerpc/configs/44x/sequoia_defconfig b/arch/powerpc/configs/44x/sequoia_defconfig > index f34fee9..9e76d9b 100644 > --- a/arch/powerpc/configs/44x/sequoia_defconfig > +++ b/arch/powerpc/configs/44x/sequoia_defconfig > @@ -20,9 +20,6 @@ CONFIG_INET=y > CONFIG_IP_PNP=y > CONFIG_IP_PNP_DHCP=y > CONFIG_IP_PNP_BOOTP=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_IPV6 is not set > CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" > CONFIG_CONNECTOR=y > diff --git a/arch/powerpc/configs/44x/taishan_defconfig b/arch/powerpc/configs/44x/taishan_defconfig > index 42cc7b4..151b4e3 100644 > --- a/arch/powerpc/configs/44x/taishan_defconfig > +++ b/arch/powerpc/configs/44x/taishan_defconfig > @@ -18,9 +18,6 @@ CONFIG_INET=y > CONFIG_IP_PNP=y > CONFIG_IP_PNP_DHCP=y > CONFIG_IP_PNP_BOOTP=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_IPV6 is not set > CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" > CONFIG_CONNECTOR=y > diff --git a/arch/powerpc/configs/52xx/pcm030_defconfig b/arch/powerpc/configs/52xx/pcm030_defconfig > index 1554de6..5d5e97a 100644 > --- a/arch/powerpc/configs/52xx/pcm030_defconfig > +++ b/arch/powerpc/configs/52xx/pcm030_defconfig > @@ -31,9 +31,6 @@ CONFIG_IP_MULTICAST=y > CONFIG_IP_PNP=y > CONFIG_IP_PNP_DHCP=y > CONFIG_IP_PNP_BOOTP=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_INET_DIAG is not set > # CONFIG_IPV6 is not set > CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" > diff --git a/arch/powerpc/configs/83xx/kmeter1_defconfig b/arch/powerpc/configs/83xx/kmeter1_defconfig > index d21b5cb..648c6b3 100644 > --- a/arch/powerpc/configs/83xx/kmeter1_defconfig > +++ b/arch/powerpc/configs/83xx/kmeter1_defconfig > @@ -25,9 +25,6 @@ CONFIG_UNIX=y > CONFIG_INET=y > CONFIG_IP_MULTICAST=y > CONFIG_IP_PNP=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_IPV6 is not set > CONFIG_TIPC=y > CONFIG_BRIDGE=m > diff --git a/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig b/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig > index 8966a9a..9f21207 100644 > --- a/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig > +++ b/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig > @@ -22,9 +22,6 @@ CONFIG_IP_PNP=y > CONFIG_IP_PNP_DHCP=y > CONFIG_IP_PNP_BOOTP=y > CONFIG_SYN_COOKIES=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_IPV6 is not set > CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" > # CONFIG_FW_LOADER is not set > diff --git a/arch/powerpc/configs/85xx/ge_imp3a_defconfig b/arch/powerpc/configs/85xx/ge_imp3a_defconfig > index d70b603..370484f 100644 > --- a/arch/powerpc/configs/85xx/ge_imp3a_defconfig > +++ b/arch/powerpc/configs/85xx/ge_imp3a_defconfig > @@ -60,7 +60,6 @@ CONFIG_SYN_COOKIES=y > CONFIG_INET_AH=m > CONFIG_INET_ESP=m > CONFIG_INET_IPCOMP=m > -# CONFIG_INET_XFRM_MODE_BEET is not set > CONFIG_INET6_AH=m > CONFIG_INET6_IPCOMP=m > CONFIG_IPV6_TUNNEL=m > diff --git a/arch/powerpc/configs/85xx/xes_mpc85xx_defconfig b/arch/powerpc/configs/85xx/xes_mpc85xx_defconfig > index 78f5beb..69da3af 100644 > --- a/arch/powerpc/configs/85xx/xes_mpc85xx_defconfig > +++ b/arch/powerpc/configs/85xx/xes_mpc85xx_defconfig > @@ -51,9 +51,6 @@ CONFIG_NET_IPIP=y > CONFIG_IP_MROUTE=y > CONFIG_IP_PIMSM_V1=y > CONFIG_IP_PIMSM_V2=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" > CONFIG_MTD=y > CONFIG_MTD_REDBOOT_PARTS=y > diff --git a/arch/powerpc/configs/adder875_defconfig b/arch/powerpc/configs/adder875_defconfig > index 935ea3ad..0607348 100644 > --- a/arch/powerpc/configs/adder875_defconfig > +++ b/arch/powerpc/configs/adder875_defconfig > @@ -22,9 +22,6 @@ CONFIG_INET=y > CONFIG_IP_MULTICAST=y > CONFIG_IP_PNP=y > CONFIG_SYN_COOKIES=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_IPV6 is not set > CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" > # CONFIG_FW_LOADER is not set > diff --git a/arch/powerpc/configs/amigaone_defconfig b/arch/powerpc/configs/amigaone_defconfig > index 12f397d..a5bbdbf 100644 > --- a/arch/powerpc/configs/amigaone_defconfig > +++ b/arch/powerpc/configs/amigaone_defconfig > @@ -26,9 +26,6 @@ CONFIG_UNIX=y > CONFIG_INET=y > CONFIG_IP_MULTICAST=y > CONFIG_SYN_COOKIES=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_IPV6 is not set > CONFIG_NETFILTER=y > # CONFIG_NETFILTER_ADVANCED is not set > diff --git a/arch/powerpc/configs/cell_defconfig b/arch/powerpc/configs/cell_defconfig > index 560a93a..3c4137f 100644 > --- a/arch/powerpc/configs/cell_defconfig > +++ b/arch/powerpc/configs/cell_defconfig > @@ -51,11 +51,9 @@ CONFIG_IP_PNP_BOOTP=y > CONFIG_IP_PNP_RARP=y > CONFIG_NET_IPIP=y > CONFIG_SYN_COOKIES=y > -# CONFIG_INET_XFRM_MODE_BEET is not set > CONFIG_INET6_AH=m > CONFIG_INET6_ESP=m > CONFIG_INET6_IPCOMP=m > -# CONFIG_INET6_XFRM_MODE_BEET is not set > # CONFIG_IPV6_SIT is not set > CONFIG_IPV6_TUNNEL=m > CONFIG_NETFILTER=y > diff --git a/arch/powerpc/configs/chrp32_defconfig b/arch/powerpc/configs/chrp32_defconfig > index a203b1c..d7be87f 100644 > --- a/arch/powerpc/configs/chrp32_defconfig > +++ b/arch/powerpc/configs/chrp32_defconfig > @@ -27,9 +27,6 @@ CONFIG_UNIX=y > CONFIG_INET=y > CONFIG_IP_MULTICAST=y > CONFIG_SYN_COOKIES=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_IPV6 is not set > CONFIG_NETFILTER=y > # CONFIG_NETFILTER_ADVANCED is not set > diff --git a/arch/powerpc/configs/ep88xc_defconfig b/arch/powerpc/configs/ep88xc_defconfig > index 7cb590e..1200461 100644 > --- a/arch/powerpc/configs/ep88xc_defconfig > +++ b/arch/powerpc/configs/ep88xc_defconfig > @@ -24,9 +24,6 @@ CONFIG_INET=y > CONFIG_IP_MULTICAST=y > CONFIG_IP_PNP=y > CONFIG_SYN_COOKIES=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_IPV6 is not set > CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" > # CONFIG_FW_LOADER is not set > diff --git a/arch/powerpc/configs/gamecube_defconfig b/arch/powerpc/configs/gamecube_defconfig > index 805b0f8..9470ccd 100644 > --- a/arch/powerpc/configs/gamecube_defconfig > +++ b/arch/powerpc/configs/gamecube_defconfig > @@ -29,9 +29,6 @@ CONFIG_INET=y > CONFIG_IP_PNP=y > CONFIG_IP_PNP_DHCP=y > CONFIG_IP_PNP_RARP=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_INET_DIAG is not set > # CONFIG_IPV6 is not set > # CONFIG_WIRELESS is not set > diff --git a/arch/powerpc/configs/mpc512x_defconfig b/arch/powerpc/configs/mpc512x_defconfig > index e4bf8aa..4c7c721 100644 > --- a/arch/powerpc/configs/mpc512x_defconfig > +++ b/arch/powerpc/configs/mpc512x_defconfig > @@ -25,9 +25,6 @@ CONFIG_PACKET=y > CONFIG_UNIX=y > CONFIG_INET=y > CONFIG_IP_PNP=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_INET_DIAG is not set > # CONFIG_IPV6 is not set > CONFIG_CAN=y > diff --git a/arch/powerpc/configs/mpc885_ads_defconfig b/arch/powerpc/configs/mpc885_ads_defconfig > index ec3fcc2..0eacbf6 100644 > --- a/arch/powerpc/configs/mpc885_ads_defconfig > +++ b/arch/powerpc/configs/mpc885_ads_defconfig > @@ -23,9 +23,6 @@ CONFIG_INET=y > CONFIG_IP_MULTICAST=y > CONFIG_IP_PNP=y > CONFIG_SYN_COOKIES=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_IPV6 is not set > CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" > # CONFIG_FW_LOADER is not set > diff --git a/arch/powerpc/configs/pmac32_defconfig b/arch/powerpc/configs/pmac32_defconfig > index 50b610b..866bcc9 100644 > --- a/arch/powerpc/configs/pmac32_defconfig > +++ b/arch/powerpc/configs/pmac32_defconfig > @@ -39,8 +39,6 @@ CONFIG_IP_MULTICAST=y > CONFIG_SYN_COOKIES=y > CONFIG_INET_AH=y > CONFIG_INET_ESP=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > # CONFIG_IPV6 is not set > CONFIG_NETFILTER=y > CONFIG_NF_CONNTRACK=m > diff --git a/arch/powerpc/configs/powernv_defconfig b/arch/powerpc/configs/powernv_defconfig > index ef2ef98..bf37a2d 100644 > --- a/arch/powerpc/configs/powernv_defconfig > +++ b/arch/powerpc/configs/powernv_defconfig > @@ -83,9 +83,6 @@ CONFIG_INET_IPCOMP=m > CONFIG_INET6_AH=m > CONFIG_INET6_ESP=m > CONFIG_INET6_IPCOMP=m > -CONFIG_INET6_XFRM_MODE_TRANSPORT=m > -CONFIG_INET6_XFRM_MODE_TUNNEL=m > -CONFIG_INET6_XFRM_MODE_BEET=m > CONFIG_IPV6_SIT=m > CONFIG_NETFILTER=y > # CONFIG_NETFILTER_ADVANCED is not set > diff --git a/arch/powerpc/configs/ppc40x_defconfig b/arch/powerpc/configs/ppc40x_defconfig > index 689d7e2..b534637 100644 > --- a/arch/powerpc/configs/ppc40x_defconfig > +++ b/arch/powerpc/configs/ppc40x_defconfig > @@ -22,9 +22,6 @@ CONFIG_INET=y > CONFIG_IP_PNP=y > CONFIG_IP_PNP_DHCP=y > CONFIG_IP_PNP_BOOTP=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" > CONFIG_CONNECTOR=y > CONFIG_MTD=y > diff --git a/arch/powerpc/configs/ppc44x_defconfig b/arch/powerpc/configs/ppc44x_defconfig > index db48039..b3ec47a 100644 > --- a/arch/powerpc/configs/ppc44x_defconfig > +++ b/arch/powerpc/configs/ppc44x_defconfig > @@ -32,9 +32,6 @@ CONFIG_INET=y > CONFIG_IP_PNP=y > CONFIG_IP_PNP_DHCP=y > CONFIG_IP_PNP_BOOTP=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > CONFIG_BRIDGE=m > CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" > CONFIG_CONNECTOR=y > diff --git a/arch/powerpc/configs/ppc6xx_defconfig b/arch/powerpc/configs/ppc6xx_defconfig > index 7c6baf6..1278d50 100644 > --- a/arch/powerpc/configs/ppc6xx_defconfig > +++ b/arch/powerpc/configs/ppc6xx_defconfig > @@ -109,9 +109,6 @@ CONFIG_SYN_COOKIES=y > CONFIG_INET_AH=m > CONFIG_INET_ESP=m > CONFIG_INET_IPCOMP=m > -CONFIG_INET_XFRM_MODE_TRANSPORT=m > -CONFIG_INET_XFRM_MODE_TUNNEL=m > -CONFIG_INET_XFRM_MODE_BEET=m > CONFIG_INET_DIAG=m > CONFIG_TCP_CONG_ADVANCED=y > CONFIG_TCP_CONG_HSTCP=m > @@ -129,7 +126,6 @@ CONFIG_INET6_AH=m > CONFIG_INET6_ESP=m > CONFIG_INET6_IPCOMP=m > CONFIG_IPV6_MIP6=m > -CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m > CONFIG_IPV6_TUNNEL=m > CONFIG_IPV6_MULTIPLE_TABLES=y > CONFIG_IPV6_SUBTREES=y > diff --git a/arch/powerpc/configs/ps3_defconfig b/arch/powerpc/configs/ps3_defconfig > index cf8d55f..22b8466 100644 > --- a/arch/powerpc/configs/ps3_defconfig > +++ b/arch/powerpc/configs/ps3_defconfig > @@ -47,9 +47,6 @@ CONFIG_INET=y > CONFIG_IP_MULTICAST=y > CONFIG_IP_PNP=y > CONFIG_IP_PNP_DHCP=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_INET_DIAG is not set > CONFIG_BT=m > CONFIG_BT_RFCOMM=m > diff --git a/arch/powerpc/configs/skiroot_defconfig b/arch/powerpc/configs/skiroot_defconfig > index a887616..5bb0894 100644 > --- a/arch/powerpc/configs/skiroot_defconfig > +++ b/arch/powerpc/configs/skiroot_defconfig > @@ -63,9 +63,6 @@ CONFIG_INET=y > CONFIG_IP_MULTICAST=y > CONFIG_NET_IPIP=y > CONFIG_SYN_COOKIES=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > CONFIG_DNS_RESOLVER=y > # CONFIG_WIRELESS is not set > CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" > diff --git a/arch/powerpc/configs/storcenter_defconfig b/arch/powerpc/configs/storcenter_defconfig > index 74bca2e..a8f9ff5 100644 > --- a/arch/powerpc/configs/storcenter_defconfig > +++ b/arch/powerpc/configs/storcenter_defconfig > @@ -22,9 +22,6 @@ CONFIG_INET=y > CONFIG_IP_MULTICAST=y > CONFIG_IP_PNP=y > CONFIG_IP_PNP_DHCP=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_IPV6 is not set > CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" > CONFIG_MTD=y > diff --git a/arch/powerpc/configs/tqm8xx_defconfig b/arch/powerpc/configs/tqm8xx_defconfig > index cd72193..b08f1cf 100644 > --- a/arch/powerpc/configs/tqm8xx_defconfig > +++ b/arch/powerpc/configs/tqm8xx_defconfig > @@ -27,9 +27,6 @@ CONFIG_UNIX=y > CONFIG_INET=y > CONFIG_IP_PNP=y > CONFIG_SYN_COOKIES=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_IPV6 is not set > # CONFIG_WIRELESS is not set > CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" > diff --git a/arch/powerpc/configs/wii_defconfig b/arch/powerpc/configs/wii_defconfig > index f5c366b..7117e9e 100644 > --- a/arch/powerpc/configs/wii_defconfig > +++ b/arch/powerpc/configs/wii_defconfig > @@ -29,9 +29,6 @@ CONFIG_INET=y > CONFIG_IP_PNP=y > CONFIG_IP_PNP_DHCP=y > CONFIG_IP_PNP_RARP=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_INET_DIAG is not set > # CONFIG_IPV6 is not set > CONFIG_BT=y > diff --git a/arch/s390/configs/debug_defconfig b/arch/s390/configs/debug_defconfig > index b0920b3..59fbd4b 100644 > --- a/arch/s390/configs/debug_defconfig > +++ b/arch/s390/configs/debug_defconfig > @@ -120,9 +120,6 @@ CONFIG_NET_IPVTI=m > CONFIG_INET_AH=m > CONFIG_INET_ESP=m > CONFIG_INET_IPCOMP=m > -CONFIG_INET_XFRM_MODE_TRANSPORT=m > -CONFIG_INET_XFRM_MODE_TUNNEL=m > -CONFIG_INET_XFRM_MODE_BEET=m > CONFIG_INET_DIAG=m > CONFIG_INET_UDP_DIAG=m > CONFIG_TCP_CONG_ADVANCED=y > @@ -138,10 +135,6 @@ CONFIG_INET6_AH=m > CONFIG_INET6_ESP=m > CONFIG_INET6_IPCOMP=m > CONFIG_IPV6_MIP6=m > -CONFIG_INET6_XFRM_MODE_TRANSPORT=m > -CONFIG_INET6_XFRM_MODE_TUNNEL=m > -CONFIG_INET6_XFRM_MODE_BEET=m > -CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m > CONFIG_IPV6_VTI=m > CONFIG_IPV6_SIT=m > CONFIG_IPV6_GRE=m > diff --git a/arch/s390/configs/performance_defconfig b/arch/s390/configs/performance_defconfig > index 09aa5cb..bf0f33c 100644 > --- a/arch/s390/configs/performance_defconfig > +++ b/arch/s390/configs/performance_defconfig > @@ -118,9 +118,6 @@ CONFIG_NET_IPVTI=m > CONFIG_INET_AH=m > CONFIG_INET_ESP=m > CONFIG_INET_IPCOMP=m > -CONFIG_INET_XFRM_MODE_TRANSPORT=m > -CONFIG_INET_XFRM_MODE_TUNNEL=m > -CONFIG_INET_XFRM_MODE_BEET=m > CONFIG_INET_DIAG=m > CONFIG_INET_UDP_DIAG=m > CONFIG_TCP_CONG_ADVANCED=y > @@ -136,10 +133,6 @@ CONFIG_INET6_AH=m > CONFIG_INET6_ESP=m > CONFIG_INET6_IPCOMP=m > CONFIG_IPV6_MIP6=m > -CONFIG_INET6_XFRM_MODE_TRANSPORT=m > -CONFIG_INET6_XFRM_MODE_TUNNEL=m > -CONFIG_INET6_XFRM_MODE_BEET=m > -CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m > CONFIG_IPV6_VTI=m > CONFIG_IPV6_SIT=m > CONFIG_IPV6_GRE=m > diff --git a/arch/sh/configs/ap325rxa_defconfig b/arch/sh/configs/ap325rxa_defconfig > index cc6e4ce..b0ab56d 100644 > --- a/arch/sh/configs/ap325rxa_defconfig > +++ b/arch/sh/configs/ap325rxa_defconfig > @@ -24,9 +24,6 @@ CONFIG_INET=y > CONFIG_IP_ADVANCED_ROUTER=y > CONFIG_IP_PNP=y > CONFIG_IP_PNP_DHCP=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_IPV6 is not set > CONFIG_MTD=y > CONFIG_MTD_CMDLINE_PARTS=y > diff --git a/arch/sh/configs/ecovec24-romimage_defconfig b/arch/sh/configs/ecovec24-romimage_defconfig > index 5c60e71..743025f 100644 > --- a/arch/sh/configs/ecovec24-romimage_defconfig > +++ b/arch/sh/configs/ecovec24-romimage_defconfig > @@ -21,9 +21,6 @@ CONFIG_NET=y > CONFIG_PACKET=y > CONFIG_UNIX=y > CONFIG_INET=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_INET_DIAG is not set > # CONFIG_IPV6 is not set > CONFIG_SCSI=y > diff --git a/arch/sh/configs/ecovec24_defconfig b/arch/sh/configs/ecovec24_defconfig > index 2fb7db4..ffb775a 100644 > --- a/arch/sh/configs/ecovec24_defconfig > +++ b/arch/sh/configs/ecovec24_defconfig > @@ -25,9 +25,6 @@ CONFIG_INET=y > CONFIG_IP_ADVANCED_ROUTER=y > CONFIG_IP_PNP=y > CONFIG_IP_PNP_DHCP=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_IPV6 is not set > CONFIG_IRDA=y > CONFIG_SH_SIR=y > diff --git a/arch/sh/configs/edosk7760_defconfig b/arch/sh/configs/edosk7760_defconfig > index 02ba622..760d0b1 100644 > --- a/arch/sh/configs/edosk7760_defconfig > +++ b/arch/sh/configs/edosk7760_defconfig > @@ -27,9 +27,6 @@ CONFIG_UNIX=y > CONFIG_INET=y > CONFIG_IP_PNP=y > CONFIG_IP_PNP_BOOTP=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_IPV6 is not set > # CONFIG_FW_LOADER is not set > CONFIG_DEBUG_DRIVER=y > diff --git a/arch/sh/configs/kfr2r09-romimage_defconfig b/arch/sh/configs/kfr2r09-romimage_defconfig > index 04436b4..5facda3 100644 > --- a/arch/sh/configs/kfr2r09-romimage_defconfig > +++ b/arch/sh/configs/kfr2r09-romimage_defconfig > @@ -22,9 +22,6 @@ CONFIG_NET=y > CONFIG_PACKET=y > CONFIG_UNIX=y > CONFIG_INET=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_INET_DIAG is not set > # CONFIG_IPV6 is not set > # CONFIG_WIRELESS is not set > diff --git a/arch/sh/configs/kfr2r09_defconfig b/arch/sh/configs/kfr2r09_defconfig > index 1dc3f67..35ad3b0 100644 > --- a/arch/sh/configs/kfr2r09_defconfig > +++ b/arch/sh/configs/kfr2r09_defconfig > @@ -29,9 +29,6 @@ CONFIG_NET=y > CONFIG_PACKET=y > CONFIG_UNIX=y > CONFIG_INET=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_INET_DIAG is not set > # CONFIG_IPV6 is not set > # CONFIG_WIRELESS is not set > diff --git a/arch/sh/configs/magicpanelr2_defconfig b/arch/sh/configs/magicpanelr2_defconfig > index 664c4de..547acf4 100644 > --- a/arch/sh/configs/magicpanelr2_defconfig > +++ b/arch/sh/configs/magicpanelr2_defconfig > @@ -31,9 +31,6 @@ CONFIG_UNIX=y > CONFIG_INET=y > CONFIG_IP_PNP=y > CONFIG_IP_PNP_DHCP=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_IPV6 is not set > # CONFIG_STANDALONE is not set > # CONFIG_PREVENT_FIRMWARE_BUILD is not set > diff --git a/arch/sh/configs/polaris_defconfig b/arch/sh/configs/polaris_defconfig > index e3a1d3d..50697b4 100644 > --- a/arch/sh/configs/polaris_defconfig > +++ b/arch/sh/configs/polaris_defconfig > @@ -33,9 +33,6 @@ CONFIG_PACKET=y > CONFIG_UNIX=y > CONFIG_INET=y > CONFIG_IP_MULTICAST=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_IPV6 is not set > CONFIG_MTD=y > CONFIG_MTD_CMDLINE_PARTS=y > diff --git a/arch/sh/configs/rsk7203_defconfig b/arch/sh/configs/rsk7203_defconfig > index 10a32bd..9774815 100644 > --- a/arch/sh/configs/rsk7203_defconfig > +++ b/arch/sh/configs/rsk7203_defconfig > @@ -40,9 +40,6 @@ CONFIG_NET=y > CONFIG_INET=y > CONFIG_IP_PNP=y > CONFIG_IP_PNP_DHCP=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_INET_DIAG is not set > # CONFIG_IPV6 is not set > # CONFIG_STANDALONE is not set > diff --git a/arch/sh/configs/rsk7264_defconfig b/arch/sh/configs/rsk7264_defconfig > index 2b0572b..b30d50d 100644 > --- a/arch/sh/configs/rsk7264_defconfig > +++ b/arch/sh/configs/rsk7264_defconfig > @@ -31,9 +31,6 @@ CONFIG_NET=y > CONFIG_INET=y > CONFIG_IP_PNP=y > CONFIG_IP_PNP_DHCP=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_INET_DIAG is not set > # CONFIG_IPV6 is not set > # CONFIG_PREVENT_FIRMWARE_BUILD is not set > diff --git a/arch/sh/configs/rsk7269_defconfig b/arch/sh/configs/rsk7269_defconfig > index fb9fa7f..fa88c2a 100644 > --- a/arch/sh/configs/rsk7269_defconfig > +++ b/arch/sh/configs/rsk7269_defconfig > @@ -20,9 +20,6 @@ CONFIG_NET=y > CONFIG_INET=y > CONFIG_IP_PNP=y > CONFIG_IP_PNP_DHCP=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_INET_DIAG is not set > # CONFIG_IPV6 is not set > # CONFIG_FW_LOADER is not set > diff --git a/arch/sh/configs/sdk7780_defconfig b/arch/sh/configs/sdk7780_defconfig > index d10a041..6ef6711 100644 > --- a/arch/sh/configs/sdk7780_defconfig > +++ b/arch/sh/configs/sdk7780_defconfig > @@ -37,9 +37,7 @@ CONFIG_IP_MULTICAST=y > CONFIG_IP_ADVANCED_ROUTER=y > CONFIG_IP_PNP=y > CONFIG_IP_PNP_BOOTP=y > -# CONFIG_INET_XFRM_MODE_BEET is not set > CONFIG_IPV6=y > -# CONFIG_INET6_XFRM_MODE_BEET is not set > CONFIG_NET_SCHED=y > CONFIG_PARPORT=y > CONFIG_BLK_DEV_LOOP=y > diff --git a/arch/sh/configs/se7206_defconfig b/arch/sh/configs/se7206_defconfig > index a93402b..0dc7228 100644 > --- a/arch/sh/configs/se7206_defconfig > +++ b/arch/sh/configs/se7206_defconfig > @@ -53,9 +53,6 @@ CONFIG_NET_KEY=y > CONFIG_INET=y > CONFIG_IP_PNP=y > CONFIG_IP_PNP_DHCP=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_INET_DIAG is not set > # CONFIG_IPV6 is not set > # CONFIG_STANDALONE is not set > diff --git a/arch/sh/configs/se7724_defconfig b/arch/sh/configs/se7724_defconfig > index 0e8d5cc..40b4d31 100644 > --- a/arch/sh/configs/se7724_defconfig > +++ b/arch/sh/configs/se7724_defconfig > @@ -26,9 +26,6 @@ CONFIG_INET=y > CONFIG_IP_ADVANCED_ROUTER=y > CONFIG_IP_PNP=y > CONFIG_IP_PNP_DHCP=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_IPV6 is not set > CONFIG_MTD=y > CONFIG_MTD_CMDLINE_PARTS=y > diff --git a/arch/sh/configs/se7780_defconfig b/arch/sh/configs/se7780_defconfig > index ec32c82..f37bebd 100644 > --- a/arch/sh/configs/se7780_defconfig > +++ b/arch/sh/configs/se7780_defconfig > @@ -25,9 +25,6 @@ CONFIG_INET=y > CONFIG_IP_MULTICAST=y > CONFIG_IP_PNP=y > CONFIG_IPV6=y > -# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET6_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET6_XFRM_MODE_BEET is not set > # CONFIG_IPV6_SIT is not set > # CONFIG_PREVENT_FIRMWARE_BUILD is not set > CONFIG_MTD=y > diff --git a/arch/sh/configs/secureedge5410_defconfig b/arch/sh/configs/secureedge5410_defconfig > index 360592d..48cefea 100644 > --- a/arch/sh/configs/secureedge5410_defconfig > +++ b/arch/sh/configs/secureedge5410_defconfig > @@ -14,9 +14,6 @@ CONFIG_SH_DMA_API=y > CONFIG_PCI=y > CONFIG_NET=y > CONFIG_INET=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_INET_DIAG is not set > # CONFIG_IPV6 is not set > CONFIG_MTD=y > diff --git a/arch/sh/configs/sh2007_defconfig b/arch/sh/configs/sh2007_defconfig > index 99975db..01ebda6 100644 > --- a/arch/sh/configs/sh2007_defconfig > +++ b/arch/sh/configs/sh2007_defconfig > @@ -38,9 +38,6 @@ CONFIG_IP_ROUTE_VERBOSE=y > CONFIG_IP_PNP=y > CONFIG_IP_PNP_DHCP=y > CONFIG_NET_IPIP=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_IPV6 is not set > CONFIG_NETWORK_SECMARK=y > CONFIG_NET_PKTGEN=y > diff --git a/arch/x86/configs/i386_defconfig b/arch/x86/configs/i386_defconfig > index 2b2481a..152fec5 100644 > --- a/arch/x86/configs/i386_defconfig > +++ b/arch/x86/configs/i386_defconfig > @@ -82,9 +82,6 @@ CONFIG_IP_MROUTE=y > CONFIG_IP_PIMSM_V1=y > CONFIG_IP_PIMSM_V2=y > CONFIG_SYN_COOKIES=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_INET_DIAG is not set > CONFIG_TCP_CONG_ADVANCED=y > # CONFIG_TCP_CONG_BIC is not set > diff --git a/arch/x86/configs/x86_64_defconfig b/arch/x86/configs/x86_64_defconfig > index e8829ab..5e85065 100644 > --- a/arch/x86/configs/x86_64_defconfig > +++ b/arch/x86/configs/x86_64_defconfig > @@ -81,9 +81,6 @@ CONFIG_IP_MROUTE=y > CONFIG_IP_PIMSM_V1=y > CONFIG_IP_PIMSM_V2=y > CONFIG_SYN_COOKIES=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_INET_DIAG is not set > CONFIG_TCP_CONG_ADVANCED=y > # CONFIG_TCP_CONG_BIC is not set > diff --git a/arch/xtensa/configs/cadence_csp_defconfig b/arch/xtensa/configs/cadence_csp_defconfig > index 62f32a9..bb1181f 100644 > --- a/arch/xtensa/configs/cadence_csp_defconfig > +++ b/arch/xtensa/configs/cadence_csp_defconfig > @@ -51,9 +51,6 @@ CONFIG_IP_PNP=y > CONFIG_IP_PNP_DHCP=y > CONFIG_IP_PNP_BOOTP=y > CONFIG_IP_PNP_RARP=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > # CONFIG_INET_DIAG is not set > # CONFIG_IPV6 is not set > # CONFIG_WIRELESS is not set >
diff --git a/arch/arc/configs/axs101_defconfig b/arch/arc/configs/axs101_defconfig index e31a8eb..714e9fd 100644 --- a/arch/arc/configs/axs101_defconfig +++ b/arch/arc/configs/axs101_defconfig @@ -35,9 +35,6 @@ CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y CONFIG_IP_PNP_BOOTP=y CONFIG_IP_PNP_RARP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_IPV6 is not set CONFIG_DEVTMPFS=y # CONFIG_STANDALONE is not set diff --git a/arch/arc/configs/axs103_defconfig b/arch/arc/configs/axs103_defconfig index e0e8567..495585c 100644 --- a/arch/arc/configs/axs103_defconfig +++ b/arch/arc/configs/axs103_defconfig @@ -34,9 +34,6 @@ CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y CONFIG_IP_PNP_BOOTP=y CONFIG_IP_PNP_RARP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_IPV6 is not set CONFIG_DEVTMPFS=y # CONFIG_STANDALONE is not set diff --git a/arch/arc/configs/axs103_smp_defconfig b/arch/arc/configs/axs103_smp_defconfig index fcbc952..eec7282 100644 --- a/arch/arc/configs/axs103_smp_defconfig +++ b/arch/arc/configs/axs103_smp_defconfig @@ -35,9 +35,6 @@ CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y CONFIG_IP_PNP_BOOTP=y CONFIG_IP_PNP_RARP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_IPV6 is not set CONFIG_DEVTMPFS=y # CONFIG_STANDALONE is not set diff --git a/arch/arc/configs/haps_hs_defconfig b/arch/arc/configs/haps_hs_defconfig index b117e6c..80c1ad0 100644 --- a/arch/arc/configs/haps_hs_defconfig +++ b/arch/arc/configs/haps_hs_defconfig @@ -29,9 +29,6 @@ CONFIG_UNIX=y CONFIG_UNIX_DIAG=y CONFIG_NET_KEY=y CONFIG_INET=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_IPV6 is not set # CONFIG_WIRELESS is not set CONFIG_DEVTMPFS=y diff --git a/arch/arc/configs/haps_hs_smp_defconfig b/arch/arc/configs/haps_hs_smp_defconfig index 33a787c..f90aaad 100644 --- a/arch/arc/configs/haps_hs_smp_defconfig +++ b/arch/arc/configs/haps_hs_smp_defconfig @@ -32,9 +32,6 @@ CONFIG_UNIX=y CONFIG_UNIX_DIAG=y CONFIG_NET_KEY=y CONFIG_INET=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_IPV6 is not set # CONFIG_WIRELESS is not set CONFIG_DEVTMPFS=y diff --git a/arch/arc/configs/nps_defconfig b/arch/arc/configs/nps_defconfig index f0a077c..f284f9d 100644 --- a/arch/arc/configs/nps_defconfig +++ b/arch/arc/configs/nps_defconfig @@ -36,9 +36,6 @@ CONFIG_NET=y CONFIG_UNIX=y CONFIG_INET=y CONFIG_IP_PNP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_INET_DIAG is not set # CONFIG_IPV6 is not set # CONFIG_WIRELESS is not set diff --git a/arch/arc/configs/nsimosci_hs_smp_defconfig b/arch/arc/configs/nsimosci_hs_smp_defconfig index 1a4bc7b..8f858a5 100644 --- a/arch/arc/configs/nsimosci_hs_smp_defconfig +++ b/arch/arc/configs/nsimosci_hs_smp_defconfig @@ -28,9 +28,6 @@ CONFIG_UNIX=y CONFIG_UNIX_DIAG=y CONFIG_NET_KEY=y CONFIG_INET=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_IPV6 is not set # CONFIG_WIRELESS is not set CONFIG_DEVTMPFS=y diff --git a/arch/arc/configs/tb10x_defconfig b/arch/arc/configs/tb10x_defconfig index 5b5119d..445cf12 100644 --- a/arch/arc/configs/tb10x_defconfig +++ b/arch/arc/configs/tb10x_defconfig @@ -36,9 +36,6 @@ CONFIG_PACKET=y CONFIG_UNIX=y CONFIG_INET=y CONFIG_IP_MULTICAST=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_INET_DIAG is not set # CONFIG_IPV6 is not set # CONFIG_WIRELESS is not set diff --git a/arch/arm/configs/acs5k_tiny_defconfig b/arch/arm/configs/acs5k_tiny_defconfig index 25c593d..d38ba59 100644 --- a/arch/arm/configs/acs5k_tiny_defconfig +++ b/arch/arm/configs/acs5k_tiny_defconfig @@ -21,9 +21,6 @@ CONFIG_NET=y CONFIG_PACKET=y CONFIG_UNIX=y CONFIG_INET=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_IPV6 is not set CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" CONFIG_MTD=y diff --git a/arch/arm/configs/am200epdkit_defconfig b/arch/arm/configs/am200epdkit_defconfig index 8c9b6ea..9a8afb2 100644 --- a/arch/arm/configs/am200epdkit_defconfig +++ b/arch/arm/configs/am200epdkit_defconfig @@ -26,9 +26,6 @@ CONFIG_NET=y CONFIG_PACKET=m CONFIG_UNIX=y CONFIG_INET=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_INET_DIAG is not set # CONFIG_IPV6 is not set CONFIG_BT=m diff --git a/arch/arm/configs/aspeed_g4_defconfig b/arch/arm/configs/aspeed_g4_defconfig index 190d6e9..f0ed931 100644 --- a/arch/arm/configs/aspeed_g4_defconfig +++ b/arch/arm/configs/aspeed_g4_defconfig @@ -51,13 +51,7 @@ CONFIG_UNIX_DIAG=y CONFIG_INET=y CONFIG_IP_MULTICAST=y CONFIG_SYN_COOKIES=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_INET_DIAG is not set -# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET6_XFRM_MODE_TUNNEL is not set -# CONFIG_INET6_XFRM_MODE_BEET is not set CONFIG_NETFILTER=y # CONFIG_NETFILTER_ADVANCED is not set CONFIG_VLAN_8021Q=y diff --git a/arch/arm/configs/aspeed_g5_defconfig b/arch/arm/configs/aspeed_g5_defconfig index 407ffb7..764e476 100644 --- a/arch/arm/configs/aspeed_g5_defconfig +++ b/arch/arm/configs/aspeed_g5_defconfig @@ -51,13 +51,7 @@ CONFIG_UNIX_DIAG=y CONFIG_INET=y CONFIG_IP_MULTICAST=y CONFIG_SYN_COOKIES=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_INET_DIAG is not set -# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET6_XFRM_MODE_TUNNEL is not set -# CONFIG_INET6_XFRM_MODE_BEET is not set CONFIG_NETFILTER=y # CONFIG_NETFILTER_ADVANCED is not set CONFIG_VLAN_8021Q=y diff --git a/arch/arm/configs/at91_dt_defconfig b/arch/arm/configs/at91_dt_defconfig index a88e314..3e55f96 100644 --- a/arch/arm/configs/at91_dt_defconfig +++ b/arch/arm/configs/at91_dt_defconfig @@ -36,13 +36,7 @@ CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y CONFIG_IP_PNP_BOOTP=y CONFIG_IP_PNP_RARP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_INET_DIAG is not set -# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET6_XFRM_MODE_TUNNEL is not set -# CONFIG_INET6_XFRM_MODE_BEET is not set CONFIG_IPV6_SIT_6RD=y CONFIG_CFG80211=y CONFIG_MAC80211=y diff --git a/arch/arm/configs/cm_x300_defconfig b/arch/arm/configs/cm_x300_defconfig index 3707a01..5d032f1 100644 --- a/arch/arm/configs/cm_x300_defconfig +++ b/arch/arm/configs/cm_x300_defconfig @@ -31,9 +31,6 @@ CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y CONFIG_IP_PNP_BOOTP=y CONFIG_IP_PNP_RARP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_INET_DIAG is not set # CONFIG_IPV6 is not set CONFIG_BT=m diff --git a/arch/arm/configs/efm32_defconfig b/arch/arm/configs/efm32_defconfig index 10ea925..0f3667b 100644 --- a/arch/arm/configs/efm32_defconfig +++ b/arch/arm/configs/efm32_defconfig @@ -34,9 +34,6 @@ CONFIG_NET=y CONFIG_PACKET=y CONFIG_UNIX=y CONFIG_INET=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_INET_DIAG is not set # CONFIG_IPV6 is not set # CONFIG_WIRELESS is not set diff --git a/arch/arm/configs/ep93xx_defconfig b/arch/arm/configs/ep93xx_defconfig index 14889a7..7448fda 100644 --- a/arch/arm/configs/ep93xx_defconfig +++ b/arch/arm/configs/ep93xx_defconfig @@ -46,9 +46,6 @@ CONFIG_IP_PNP_DHCP=y CONFIG_IP_PNP_BOOTP=y CONFIG_SYN_COOKIES=y CONFIG_IPV6=y -# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET6_XFRM_MODE_TUNNEL is not set -# CONFIG_INET6_XFRM_MODE_BEET is not set # CONFIG_IPV6_SIT is not set CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" # CONFIG_FW_LOADER is not set diff --git a/arch/arm/configs/ezx_defconfig b/arch/arm/configs/ezx_defconfig index e3afca5..3bc8a50 100644 --- a/arch/arm/configs/ezx_defconfig +++ b/arch/arm/configs/ezx_defconfig @@ -45,9 +45,6 @@ CONFIG_IP_PNP_DHCP=y CONFIG_IP_PNP_BOOTP=y CONFIG_IP_PNP_RARP=y CONFIG_SYN_COOKIES=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_INET_DIAG is not set CONFIG_INET6_AH=m CONFIG_INET6_ESP=m diff --git a/arch/arm/configs/h5000_defconfig b/arch/arm/configs/h5000_defconfig index e90d1df..fc9e997 100644 --- a/arch/arm/configs/h5000_defconfig +++ b/arch/arm/configs/h5000_defconfig @@ -27,9 +27,6 @@ CONFIG_UNIX=y CONFIG_INET=y CONFIG_IP_MULTICAST=y CONFIG_IP_PNP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_INET_DIAG is not set # CONFIG_IPV6 is not set CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" diff --git a/arch/arm/configs/imote2_defconfig b/arch/arm/configs/imote2_defconfig index 9b779e1..d68a0f1 100644 --- a/arch/arm/configs/imote2_defconfig +++ b/arch/arm/configs/imote2_defconfig @@ -38,9 +38,6 @@ CONFIG_IP_PNP_DHCP=y CONFIG_IP_PNP_BOOTP=y CONFIG_IP_PNP_RARP=y CONFIG_SYN_COOKIES=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_INET_DIAG is not set CONFIG_INET6_AH=m CONFIG_INET6_ESP=m diff --git a/arch/arm/configs/imx_v4_v5_defconfig b/arch/arm/configs/imx_v4_v5_defconfig index f2cf072..6810ce7 100644 --- a/arch/arm/configs/imx_v4_v5_defconfig +++ b/arch/arm/configs/imx_v4_v5_defconfig @@ -41,9 +41,6 @@ CONFIG_INET=y CONFIG_IP_MULTICAST=y CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_INET_DIAG is not set # CONFIG_IPV6 is not set CONFIG_NETFILTER=y diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig index 6589820..0b79b48 100644 --- a/arch/arm/configs/imx_v6_v7_defconfig +++ b/arch/arm/configs/imx_v6_v7_defconfig @@ -75,9 +75,6 @@ CONFIG_UNIX=y CONFIG_INET=y CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set CONFIG_NETFILTER=y CONFIG_CAN=y CONFIG_CAN_FLEXCAN=y diff --git a/arch/arm/configs/iop13xx_defconfig b/arch/arm/configs/iop13xx_defconfig index a73b6a3..c5c1372 100644 --- a/arch/arm/configs/iop13xx_defconfig +++ b/arch/arm/configs/iop13xx_defconfig @@ -30,9 +30,6 @@ CONFIG_IP_MULTICAST=y CONFIG_IP_PNP=y CONFIG_IP_PNP_BOOTP=y CONFIG_IPV6=y -# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET6_XFRM_MODE_TUNNEL is not set -# CONFIG_INET6_XFRM_MODE_BEET is not set # CONFIG_IPV6_SIT is not set CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" CONFIG_MTD=y diff --git a/arch/arm/configs/iop32x_defconfig b/arch/arm/configs/iop32x_defconfig index f63362b..a8c6a89 100644 --- a/arch/arm/configs/iop32x_defconfig +++ b/arch/arm/configs/iop32x_defconfig @@ -26,9 +26,6 @@ CONFIG_IP_MULTICAST=y CONFIG_IP_PNP=y CONFIG_IP_PNP_BOOTP=y CONFIG_IPV6=y -# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET6_XFRM_MODE_TUNNEL is not set -# CONFIG_INET6_XFRM_MODE_BEET is not set # CONFIG_IPV6_SIT is not set CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" CONFIG_MTD=y diff --git a/arch/arm/configs/iop33x_defconfig b/arch/arm/configs/iop33x_defconfig index d22f832..8529828 100644 --- a/arch/arm/configs/iop33x_defconfig +++ b/arch/arm/configs/iop33x_defconfig @@ -24,9 +24,6 @@ CONFIG_IP_MULTICAST=y CONFIG_IP_PNP=y CONFIG_IP_PNP_BOOTP=y CONFIG_IPV6=y -# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET6_XFRM_MODE_TUNNEL is not set -# CONFIG_INET6_XFRM_MODE_BEET is not set # CONFIG_IPV6_SIT is not set CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" CONFIG_MTD=y diff --git a/arch/arm/configs/keystone_defconfig b/arch/arm/configs/keystone_defconfig index 72fee57..c7007b2 100644 --- a/arch/arm/configs/keystone_defconfig +++ b/arch/arm/configs/keystone_defconfig @@ -66,9 +66,6 @@ CONFIG_IP_MROUTE_MULTIPLE_TABLES=y CONFIG_IP_PIMSM_V2=y CONFIG_INET_AH=y CONFIG_INET_IPCOMP=y -CONFIG_INET6_XFRM_MODE_TRANSPORT=m -CONFIG_INET6_XFRM_MODE_TUNNEL=m -CONFIG_INET6_XFRM_MODE_BEET=m CONFIG_IPV6_SIT=m CONFIG_IPV6_MULTIPLE_TABLES=y CONFIG_IPV6_SUBTREES=y diff --git a/arch/arm/configs/lpc18xx_defconfig b/arch/arm/configs/lpc18xx_defconfig index e3d5e15..c7c3d3e 100644 --- a/arch/arm/configs/lpc18xx_defconfig +++ b/arch/arm/configs/lpc18xx_defconfig @@ -40,9 +40,6 @@ CONFIG_NET=y CONFIG_PACKET=y CONFIG_UNIX=y CONFIG_INET=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_INET_DIAG is not set # CONFIG_IPV6 is not set # CONFIG_WIRELESS is not set diff --git a/arch/arm/configs/lpc32xx_defconfig b/arch/arm/configs/lpc32xx_defconfig index 4b3b2c6..68fae31 100644 --- a/arch/arm/configs/lpc32xx_defconfig +++ b/arch/arm/configs/lpc32xx_defconfig @@ -35,9 +35,6 @@ CONFIG_IP_MULTICAST=y CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y CONFIG_IP_PNP_BOOTP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_INET_DIAG is not set # CONFIG_WIRELESS is not set CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" diff --git a/arch/arm/configs/lpd270_defconfig b/arch/arm/configs/lpd270_defconfig index 3a4d0e6..1d60896 100644 --- a/arch/arm/configs/lpd270_defconfig +++ b/arch/arm/configs/lpd270_defconfig @@ -15,9 +15,6 @@ CONFIG_INET=y CONFIG_IP_PNP=y CONFIG_IP_PNP_BOOTP=y CONFIG_IPV6=y -# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET6_XFRM_MODE_TUNNEL is not set -# CONFIG_INET6_XFRM_MODE_BEET is not set # CONFIG_IPV6_SIT is not set CONFIG_MTD=y CONFIG_MTD_REDBOOT_PARTS=y diff --git a/arch/arm/configs/magician_defconfig b/arch/arm/configs/magician_defconfig index de5be2f..1f6fa24 100644 --- a/arch/arm/configs/magician_defconfig +++ b/arch/arm/configs/magician_defconfig @@ -31,9 +31,6 @@ CONFIG_UNIX=y CONFIG_INET=y CONFIG_IP_MULTICAST=y CONFIG_IP_PNP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_INET_DIAG is not set # CONFIG_IPV6 is not set CONFIG_IRDA=m diff --git a/arch/arm/configs/mini2440_defconfig b/arch/arm/configs/mini2440_defconfig index 7d26ca0..b70577c9 100644 --- a/arch/arm/configs/mini2440_defconfig +++ b/arch/arm/configs/mini2440_defconfig @@ -46,9 +46,6 @@ CONFIG_IP_MROUTE=y CONFIG_IP_PIMSM_V1=y CONFIG_IP_PIMSM_V2=y CONFIG_SYN_COOKIES=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set CONFIG_INET_DIAG=m # CONFIG_IPV6 is not set CONFIG_NETFILTER=y diff --git a/arch/arm/configs/moxart_defconfig b/arch/arm/configs/moxart_defconfig index 6a11669..169b861 100644 --- a/arch/arm/configs/moxart_defconfig +++ b/arch/arm/configs/moxart_defconfig @@ -32,9 +32,6 @@ CONFIG_INET=y CONFIG_IP_MULTICAST=y CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_INET_DIAG is not set # CONFIG_IPV6 is not set # CONFIG_WIRELESS is not set diff --git a/arch/arm/configs/mps2_defconfig b/arch/arm/configs/mps2_defconfig index 1d923dbb..f2f0416 100644 --- a/arch/arm/configs/mps2_defconfig +++ b/arch/arm/configs/mps2_defconfig @@ -32,9 +32,6 @@ CONFIG_UNIX=y CONFIG_INET=y CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_INET_DIAG is not set # CONFIG_IPV6 is not set # CONFIG_WIRELESS is not set diff --git a/arch/arm/configs/mxs_defconfig b/arch/arm/configs/mxs_defconfig index ed570a0..5b55120 100644 --- a/arch/arm/configs/mxs_defconfig +++ b/arch/arm/configs/mxs_defconfig @@ -34,9 +34,6 @@ CONFIG_INET=y CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y CONFIG_SYN_COOKIES=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_INET_DIAG is not set # CONFIG_IPV6 is not set CONFIG_CAN=m diff --git a/arch/arm/configs/omap1_defconfig b/arch/arm/configs/omap1_defconfig index 82af77c..80f923a 100644 --- a/arch/arm/configs/omap1_defconfig +++ b/arch/arm/configs/omap1_defconfig @@ -68,9 +68,6 @@ CONFIG_IP_MULTICAST=y CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y CONFIG_IP_PNP_BOOTP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_INET_DIAG is not set CONFIG_IPV6=y CONFIG_NETFILTER=y diff --git a/arch/arm/configs/palmz72_defconfig b/arch/arm/configs/palmz72_defconfig index e0a6142..1b4a6cf 100644 --- a/arch/arm/configs/palmz72_defconfig +++ b/arch/arm/configs/palmz72_defconfig @@ -26,9 +26,6 @@ CONFIG_UNIX=y CONFIG_INET=y CONFIG_IP_PNP=y CONFIG_IP_PNP_BOOTP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_IPV6 is not set CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" CONFIG_BLK_DEV_LOOP=y diff --git a/arch/arm/configs/pcm027_defconfig b/arch/arm/configs/pcm027_defconfig index 9c88a19..9b38b4b 100644 --- a/arch/arm/configs/pcm027_defconfig +++ b/arch/arm/configs/pcm027_defconfig @@ -30,9 +30,6 @@ CONFIG_PACKET=y CONFIG_UNIX=y CONFIG_INET=y CONFIG_IP_PNP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_INET_DIAG is not set # CONFIG_IPV6 is not set CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" diff --git a/arch/arm/configs/pxa3xx_defconfig b/arch/arm/configs/pxa3xx_defconfig index 7681eea..794ae4f 100644 --- a/arch/arm/configs/pxa3xx_defconfig +++ b/arch/arm/configs/pxa3xx_defconfig @@ -21,9 +21,6 @@ CONFIG_PACKET=y CONFIG_UNIX=y CONFIG_INET=y CONFIG_IP_PNP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_INET_DIAG is not set # CONFIG_IPV6 is not set CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" diff --git a/arch/arm/configs/qcom_defconfig b/arch/arm/configs/qcom_defconfig index c185475..f40bf4b 100644 --- a/arch/arm/configs/qcom_defconfig +++ b/arch/arm/configs/qcom_defconfig @@ -46,9 +46,6 @@ CONFIG_IP_MULTIPLE_TABLES=y CONFIG_IP_ROUTE_VERBOSE=y CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_IPV6 is not set CONFIG_CFG80211=m CONFIG_MAC80211=m diff --git a/arch/arm/configs/rpc_defconfig b/arch/arm/configs/rpc_defconfig index 3b82b64..02de1ac 100644 --- a/arch/arm/configs/rpc_defconfig +++ b/arch/arm/configs/rpc_defconfig @@ -17,12 +17,6 @@ CONFIG_PACKET=y CONFIG_UNIX=y CONFIG_INET=y CONFIG_IP_MULTICAST=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set -# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET6_XFRM_MODE_TUNNEL is not set -# CONFIG_INET6_XFRM_MODE_BEET is not set CONFIG_PARPORT=y CONFIG_PARPORT_PC=y CONFIG_PARPORT_PC_FIFO=y diff --git a/arch/arm/configs/s3c2410_defconfig b/arch/arm/configs/s3c2410_defconfig index 39c6485..b3f939f 100644 --- a/arch/arm/configs/s3c2410_defconfig +++ b/arch/arm/configs/s3c2410_defconfig @@ -74,7 +74,6 @@ CONFIG_INET6_AH=m CONFIG_INET6_ESP=m CONFIG_INET6_IPCOMP=m CONFIG_IPV6_MIP6=m -CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m CONFIG_IPV6_TUNNEL=m CONFIG_NETFILTER=y CONFIG_NF_CONNTRACK=m diff --git a/arch/arm/configs/sama5_defconfig b/arch/arm/configs/sama5_defconfig index d5341b0..679a4c7 100644 --- a/arch/arm/configs/sama5_defconfig +++ b/arch/arm/configs/sama5_defconfig @@ -42,13 +42,7 @@ CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y CONFIG_IP_PNP_BOOTP=y CONFIG_IP_PNP_RARP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_INET_DIAG is not set -# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET6_XFRM_MODE_TUNNEL is not set -# CONFIG_INET6_XFRM_MODE_BEET is not set CONFIG_IPV6_SIT_6RD=y CONFIG_CAN=y CONFIG_CAN_AT91=y diff --git a/arch/arm/configs/sunxi_defconfig b/arch/arm/configs/sunxi_defconfig index df433ab..c6ce0e4 100644 --- a/arch/arm/configs/sunxi_defconfig +++ b/arch/arm/configs/sunxi_defconfig @@ -24,9 +24,6 @@ CONFIG_INET=y CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y CONFIG_IP_PNP_BOOTP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_INET_DIAG is not set # CONFIG_IPV6 is not set CONFIG_CAN=y diff --git a/arch/arm/configs/tango4_defconfig b/arch/arm/configs/tango4_defconfig index 68eb16e..fb80a3a 100644 --- a/arch/arm/configs/tango4_defconfig +++ b/arch/arm/configs/tango4_defconfig @@ -29,9 +29,6 @@ CONFIG_INET=y CONFIG_IP_MULTICAST=y CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_IPV6 is not set CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" CONFIG_DEVTMPFS=y diff --git a/arch/arm/configs/tegra_defconfig b/arch/arm/configs/tegra_defconfig index 8f5c6a5..27d4499 100644 --- a/arch/arm/configs/tegra_defconfig +++ b/arch/arm/configs/tegra_defconfig @@ -44,8 +44,6 @@ CONFIG_IP_PNP_DHCP=y CONFIG_IP_PNP_BOOTP=y CONFIG_IP_PNP_RARP=y CONFIG_INET_ESP=y -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_INET_DIAG is not set CONFIG_IPV6_ROUTER_PREF=y CONFIG_IPV6_OPTIMISTIC_DAD=y diff --git a/arch/arm/configs/xcep_defconfig b/arch/arm/configs/xcep_defconfig index 2eda246..2a2ba7a 100644 --- a/arch/arm/configs/xcep_defconfig +++ b/arch/arm/configs/xcep_defconfig @@ -38,9 +38,6 @@ CONFIG_IP_MULTICAST=y CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y CONFIG_IP_PNP_BOOTP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_INET_DIAG is not set # CONFIG_IPV6 is not set CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" diff --git a/arch/hexagon/configs/comet_defconfig b/arch/hexagon/configs/comet_defconfig index e324f65..c35fd25d 100644 --- a/arch/hexagon/configs/comet_defconfig +++ b/arch/hexagon/configs/comet_defconfig @@ -65,9 +65,6 @@ CONFIG_NET=y CONFIG_PACKET=y CONFIG_UNIX=y CONFIG_INET=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_INET_LRO is not set # CONFIG_INET_DIAG is not set # CONFIG_IPV6 is not set diff --git a/arch/m68k/configs/amcore_defconfig b/arch/m68k/configs/amcore_defconfig index d5e683d..a04cf3e 100644 --- a/arch/m68k/configs/amcore_defconfig +++ b/arch/m68k/configs/amcore_defconfig @@ -28,9 +28,6 @@ CONFIG_PACKET=y CONFIG_UNIX=y CONFIG_INET=y CONFIG_SYN_COOKIES=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_IPV6 is not set # CONFIG_WIRELESS is not set # CONFIG_UEVENT_HELPER is not set diff --git a/arch/m68k/configs/m5208evb_defconfig b/arch/m68k/configs/m5208evb_defconfig index a3102ff..c3aa6f2 100644 --- a/arch/m68k/configs/m5208evb_defconfig +++ b/arch/m68k/configs/m5208evb_defconfig @@ -23,9 +23,6 @@ CONFIG_NET=y CONFIG_PACKET=y CONFIG_UNIX=y CONFIG_INET=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_INET_DIAG is not set # CONFIG_IPV6 is not set # CONFIG_FW_LOADER is not set diff --git a/arch/m68k/configs/m5249evb_defconfig b/arch/m68k/configs/m5249evb_defconfig index f7bb9ed..c422e7f 100644 --- a/arch/m68k/configs/m5249evb_defconfig +++ b/arch/m68k/configs/m5249evb_defconfig @@ -24,9 +24,6 @@ CONFIG_NET=y CONFIG_PACKET=y CONFIG_UNIX=y CONFIG_INET=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_INET_DIAG is not set # CONFIG_IPV6 is not set # CONFIG_FW_LOADER is not set diff --git a/arch/m68k/configs/m5272c3_defconfig b/arch/m68k/configs/m5272c3_defconfig index 1e679f6..3eeb611 100644 --- a/arch/m68k/configs/m5272c3_defconfig +++ b/arch/m68k/configs/m5272c3_defconfig @@ -24,9 +24,6 @@ CONFIG_NET=y CONFIG_PACKET=y CONFIG_UNIX=y CONFIG_INET=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_INET_DIAG is not set # CONFIG_IPV6 is not set # CONFIG_FW_LOADER is not set diff --git a/arch/m68k/configs/m5275evb_defconfig b/arch/m68k/configs/m5275evb_defconfig index d2987b4..52372ee 100644 --- a/arch/m68k/configs/m5275evb_defconfig +++ b/arch/m68k/configs/m5275evb_defconfig @@ -24,9 +24,6 @@ CONFIG_NET=y CONFIG_PACKET=y CONFIG_UNIX=y CONFIG_INET=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_INET_DIAG is not set # CONFIG_IPV6 is not set # CONFIG_FW_LOADER is not set diff --git a/arch/m68k/configs/m5307c3_defconfig b/arch/m68k/configs/m5307c3_defconfig index 97a78c9..4efad64 100644 --- a/arch/m68k/configs/m5307c3_defconfig +++ b/arch/m68k/configs/m5307c3_defconfig @@ -24,9 +24,6 @@ CONFIG_NET=y CONFIG_PACKET=y CONFIG_UNIX=y CONFIG_INET=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_INET_DIAG is not set # CONFIG_IPV6 is not set # CONFIG_FW_LOADER is not set diff --git a/arch/m68k/configs/m5407c3_defconfig b/arch/m68k/configs/m5407c3_defconfig index 766a97f..eecbece1 100644 --- a/arch/m68k/configs/m5407c3_defconfig +++ b/arch/m68k/configs/m5407c3_defconfig @@ -25,9 +25,6 @@ CONFIG_NET=y CONFIG_PACKET=y CONFIG_UNIX=y CONFIG_INET=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_INET_DIAG is not set # CONFIG_IPV6 is not set # CONFIG_FW_LOADER is not set diff --git a/arch/mips/configs/ar7_defconfig b/arch/mips/configs/ar7_defconfig index c83fdf6..7284102 100644 --- a/arch/mips/configs/ar7_defconfig +++ b/arch/mips/configs/ar7_defconfig @@ -33,9 +33,6 @@ CONFIG_IP_ROUTE_MULTIPATH=y CONFIG_IP_ROUTE_VERBOSE=y CONFIG_IP_MROUTE=y CONFIG_SYN_COOKIES=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_INET_DIAG is not set CONFIG_TCP_CONG_ADVANCED=y # CONFIG_TCP_CONG_BIC is not set diff --git a/arch/mips/configs/ath25_defconfig b/arch/mips/configs/ath25_defconfig index 5dd6b19..1210f7c 100644 --- a/arch/mips/configs/ath25_defconfig +++ b/arch/mips/configs/ath25_defconfig @@ -30,9 +30,6 @@ CONFIG_UNIX=y CONFIG_INET=y CONFIG_IP_MULTICAST=y CONFIG_IP_ADVANCED_ROUTER=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_IPV6 is not set CONFIG_CFG80211=m CONFIG_MAC80211=m diff --git a/arch/mips/configs/ath79_defconfig b/arch/mips/configs/ath79_defconfig index 6f981af..f923153 100644 --- a/arch/mips/configs/ath79_defconfig +++ b/arch/mips/configs/ath79_defconfig @@ -30,9 +30,6 @@ CONFIG_UNIX=y CONFIG_INET=y CONFIG_IP_MULTICAST=y CONFIG_IP_ADVANCED_ROUTER=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_IPV6 is not set CONFIG_CFG80211=m CONFIG_MAC80211=m diff --git a/arch/mips/configs/bcm63xx_defconfig b/arch/mips/configs/bcm63xx_defconfig index d22fe62..3b646b4 100644 --- a/arch/mips/configs/bcm63xx_defconfig +++ b/arch/mips/configs/bcm63xx_defconfig @@ -26,9 +26,6 @@ CONFIG_PCMCIA_BCM63XX=y CONFIG_NET=y CONFIG_UNIX=y CONFIG_INET=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_INET_DIAG is not set # CONFIG_IPV6 is not set CONFIG_CFG80211=y diff --git a/arch/mips/configs/bigsur_defconfig b/arch/mips/configs/bigsur_defconfig index 597bc0a..215a4b4 100644 --- a/arch/mips/configs/bigsur_defconfig +++ b/arch/mips/configs/bigsur_defconfig @@ -49,8 +49,6 @@ CONFIG_IP_PIMSM_V2=y CONFIG_INET_AH=m CONFIG_INET_ESP=m CONFIG_INET_IPCOMP=m -CONFIG_INET_XFRM_MODE_TRANSPORT=m -CONFIG_INET_XFRM_MODE_TUNNEL=m CONFIG_TCP_MD5SIG=y CONFIG_IPV6_ROUTER_PREF=y CONFIG_IPV6_ROUTE_INFO=y @@ -59,7 +57,6 @@ CONFIG_INET6_AH=m CONFIG_INET6_ESP=m CONFIG_INET6_IPCOMP=m CONFIG_IPV6_MIP6=m -CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m CONFIG_IPV6_SIT_6RD=y CONFIG_IPV6_TUNNEL=m CONFIG_IPV6_MULTIPLE_TABLES=y diff --git a/arch/mips/configs/bmips_be_defconfig b/arch/mips/configs/bmips_be_defconfig index 8a91f01..170c8d2 100644 --- a/arch/mips/configs/bmips_be_defconfig +++ b/arch/mips/configs/bmips_be_defconfig @@ -19,9 +19,6 @@ CONFIG_PACKET=y CONFIG_PACKET_DIAG=y CONFIG_UNIX=y CONFIG_INET=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_INET_DIAG is not set CONFIG_CFG80211=y CONFIG_NL80211_TESTMODE=y diff --git a/arch/mips/configs/bmips_stb_defconfig b/arch/mips/configs/bmips_stb_defconfig index 39adcca..378b70e 100644 --- a/arch/mips/configs/bmips_stb_defconfig +++ b/arch/mips/configs/bmips_stb_defconfig @@ -28,9 +28,6 @@ CONFIG_PACKET=y CONFIG_PACKET_DIAG=y CONFIG_UNIX=y CONFIG_INET=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_INET_DIAG is not set CONFIG_CFG80211=y CONFIG_NL80211_TESTMODE=y diff --git a/arch/mips/configs/capcella_defconfig b/arch/mips/configs/capcella_defconfig index 7bf8971..1e51550 100644 --- a/arch/mips/configs/capcella_defconfig +++ b/arch/mips/configs/capcella_defconfig @@ -20,9 +20,6 @@ CONFIG_INET=y CONFIG_IP_MULTICAST=y CONFIG_IP_PNP=y CONFIG_IP_PNP_BOOTP=y -CONFIG_INET_XFRM_MODE_TRANSPORT=m -CONFIG_INET_XFRM_MODE_TUNNEL=m -CONFIG_INET_XFRM_MODE_BEET=m CONFIG_TCP_MD5SIG=y # CONFIG_IPV6 is not set CONFIG_NETWORK_SECMARK=y diff --git a/arch/mips/configs/ci20_defconfig b/arch/mips/configs/ci20_defconfig index 50bebce..1c06326 100644 --- a/arch/mips/configs/ci20_defconfig +++ b/arch/mips/configs/ci20_defconfig @@ -38,9 +38,6 @@ CONFIG_UNIX=y CONFIG_INET=y CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_INET_DIAG is not set # CONFIG_IPV6 is not set # CONFIG_WIRELESS is not set diff --git a/arch/mips/configs/db1xxx_defconfig b/arch/mips/configs/db1xxx_defconfig index bc9b6ae..f2afc9b 100644 --- a/arch/mips/configs/db1xxx_defconfig +++ b/arch/mips/configs/db1xxx_defconfig @@ -62,7 +62,6 @@ CONFIG_INET6_AH=y CONFIG_INET6_ESP=y CONFIG_INET6_IPCOMP=y CONFIG_IPV6_MIP6=y -CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=y CONFIG_IPV6_VTI=y CONFIG_IPV6_SIT_6RD=y CONFIG_IPV6_GRE=y diff --git a/arch/mips/configs/decstation_64_defconfig b/arch/mips/configs/decstation_64_defconfig index 85f1955..f962d58 100644 --- a/arch/mips/configs/decstation_64_defconfig +++ b/arch/mips/configs/decstation_64_defconfig @@ -37,9 +37,6 @@ CONFIG_SYN_COOKIES=y CONFIG_INET_AH=m CONFIG_INET_ESP=m CONFIG_INET_IPCOMP=m -CONFIG_INET_XFRM_MODE_TRANSPORT=m -CONFIG_INET_XFRM_MODE_TUNNEL=m -CONFIG_INET_XFRM_MODE_BEET=m CONFIG_TCP_MD5SIG=y CONFIG_IPV6_ROUTER_PREF=y CONFIG_IPV6_ROUTE_INFO=y @@ -47,7 +44,6 @@ CONFIG_INET6_AH=m CONFIG_INET6_ESP=m CONFIG_INET6_IPCOMP=m CONFIG_IPV6_MIP6=m -CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m CONFIG_IPV6_MULTIPLE_TABLES=y CONFIG_IPV6_SUBTREES=y CONFIG_NETWORK_SECMARK=y diff --git a/arch/mips/configs/decstation_defconfig b/arch/mips/configs/decstation_defconfig index 30a6eaf..42f52a7 100644 --- a/arch/mips/configs/decstation_defconfig +++ b/arch/mips/configs/decstation_defconfig @@ -33,9 +33,6 @@ CONFIG_SYN_COOKIES=y CONFIG_INET_AH=m CONFIG_INET_ESP=m CONFIG_INET_IPCOMP=m -CONFIG_INET_XFRM_MODE_TRANSPORT=m -CONFIG_INET_XFRM_MODE_TUNNEL=m -CONFIG_INET_XFRM_MODE_BEET=m CONFIG_TCP_MD5SIG=y CONFIG_IPV6_ROUTER_PREF=y CONFIG_IPV6_ROUTE_INFO=y @@ -43,7 +40,6 @@ CONFIG_INET6_AH=m CONFIG_INET6_ESP=m CONFIG_INET6_IPCOMP=m CONFIG_IPV6_MIP6=m -CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m CONFIG_IPV6_MULTIPLE_TABLES=y CONFIG_IPV6_SUBTREES=y CONFIG_NETWORK_SECMARK=y diff --git a/arch/mips/configs/decstation_r4k_defconfig b/arch/mips/configs/decstation_r4k_defconfig index e2b58db..6bf3d55 100644 --- a/arch/mips/configs/decstation_r4k_defconfig +++ b/arch/mips/configs/decstation_r4k_defconfig @@ -32,9 +32,6 @@ CONFIG_SYN_COOKIES=y CONFIG_INET_AH=m CONFIG_INET_ESP=m CONFIG_INET_IPCOMP=m -CONFIG_INET_XFRM_MODE_TRANSPORT=m -CONFIG_INET_XFRM_MODE_TUNNEL=m -CONFIG_INET_XFRM_MODE_BEET=m CONFIG_TCP_MD5SIG=y CONFIG_IPV6_ROUTER_PREF=y CONFIG_IPV6_ROUTE_INFO=y @@ -42,7 +39,6 @@ CONFIG_INET6_AH=m CONFIG_INET6_ESP=m CONFIG_INET6_IPCOMP=m CONFIG_IPV6_MIP6=m -CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m CONFIG_IPV6_MULTIPLE_TABLES=y CONFIG_IPV6_SUBTREES=y CONFIG_NETWORK_SECMARK=y diff --git a/arch/mips/configs/fuloong2e_defconfig b/arch/mips/configs/fuloong2e_defconfig index 8bcb61a..7858f85 100644 --- a/arch/mips/configs/fuloong2e_defconfig +++ b/arch/mips/configs/fuloong2e_defconfig @@ -36,8 +36,6 @@ CONFIG_IP_MULTICAST=y CONFIG_IP_PNP=y CONFIG_IP_PNP_BOOTP=y CONFIG_NET_IPIP=m -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set # CONFIG_INET_DIAG is not set # CONFIG_IPV6 is not set CONFIG_NETFILTER=y diff --git a/arch/mips/configs/gpr_defconfig b/arch/mips/configs/gpr_defconfig index 9d9af5f..79a537e 100644 --- a/arch/mips/configs/gpr_defconfig +++ b/arch/mips/configs/gpr_defconfig @@ -29,9 +29,6 @@ CONFIG_IP_ROUTE_VERBOSE=y CONFIG_IP_PNP=y CONFIG_IP_PNP_BOOTP=y CONFIG_SYN_COOKIES=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_IPV6 is not set CONFIG_NETWORK_SECMARK=y CONFIG_NETFILTER=y diff --git a/arch/mips/configs/ip22_defconfig b/arch/mips/configs/ip22_defconfig index 21a1168..e497f68 100644 --- a/arch/mips/configs/ip22_defconfig +++ b/arch/mips/configs/ip22_defconfig @@ -36,9 +36,6 @@ CONFIG_IP_PNP_BOOTP=y CONFIG_INET_AH=m CONFIG_INET_ESP=m CONFIG_INET_IPCOMP=m -CONFIG_INET_XFRM_MODE_TRANSPORT=m -CONFIG_INET_XFRM_MODE_TUNNEL=m -CONFIG_INET_XFRM_MODE_BEET=m CONFIG_TCP_MD5SIG=y CONFIG_IPV6_ROUTER_PREF=y CONFIG_IPV6_ROUTE_INFO=y @@ -47,7 +44,6 @@ CONFIG_INET6_AH=m CONFIG_INET6_ESP=m CONFIG_INET6_IPCOMP=m CONFIG_IPV6_MIP6=m -CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m CONFIG_IPV6_TUNNEL=m CONFIG_IPV6_MULTIPLE_TABLES=y CONFIG_IPV6_SUBTREES=y diff --git a/arch/mips/configs/ip27_defconfig b/arch/mips/configs/ip27_defconfig index 54db5ded..22bb258 100644 --- a/arch/mips/configs/ip27_defconfig +++ b/arch/mips/configs/ip27_defconfig @@ -33,9 +33,6 @@ CONFIG_NET_KEY_MIGRATE=y CONFIG_INET=y CONFIG_IP_MULTICAST=y CONFIG_IP_PNP=y -CONFIG_INET_XFRM_MODE_TRANSPORT=m -CONFIG_INET_XFRM_MODE_TUNNEL=m -CONFIG_INET_XFRM_MODE_BEET=m CONFIG_TCP_MD5SIG=y CONFIG_IPV6_ROUTER_PREF=y CONFIG_IPV6_ROUTE_INFO=y @@ -44,10 +41,6 @@ CONFIG_INET6_AH=m CONFIG_INET6_ESP=m CONFIG_INET6_IPCOMP=m CONFIG_IPV6_MIP6=m -CONFIG_INET6_XFRM_MODE_TRANSPORT=m -CONFIG_INET6_XFRM_MODE_TUNNEL=m -CONFIG_INET6_XFRM_MODE_BEET=m -CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m CONFIG_IPV6_SIT=m CONFIG_IPV6_SIT_6RD=y CONFIG_IPV6_TUNNEL=m diff --git a/arch/mips/configs/ip28_defconfig b/arch/mips/configs/ip28_defconfig index 0921ef3..ba13eea 100644 --- a/arch/mips/configs/ip28_defconfig +++ b/arch/mips/configs/ip28_defconfig @@ -29,9 +29,6 @@ CONFIG_IP_MULTICAST=y CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y CONFIG_IP_PNP_BOOTP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set CONFIG_TCP_MD5SIG=y # CONFIG_IPV6 is not set CONFIG_SCSI=y diff --git a/arch/mips/configs/jazz_defconfig b/arch/mips/configs/jazz_defconfig index 328d4df..b618dd0 100644 --- a/arch/mips/configs/jazz_defconfig +++ b/arch/mips/configs/jazz_defconfig @@ -26,8 +26,6 @@ CONFIG_NET_IPIP=m CONFIG_IP_MROUTE=y CONFIG_IP_PIMSM_V1=y CONFIG_IP_PIMSM_V2=y -CONFIG_INET_XFRM_MODE_TRANSPORT=m -CONFIG_INET_XFRM_MODE_TUNNEL=m CONFIG_TCP_MD5SIG=y CONFIG_IPV6_ROUTER_PREF=y CONFIG_IPV6_ROUTE_INFO=y diff --git a/arch/mips/configs/jmr3927_defconfig b/arch/mips/configs/jmr3927_defconfig index 24b96fa..4544548 100644 --- a/arch/mips/configs/jmr3927_defconfig +++ b/arch/mips/configs/jmr3927_defconfig @@ -12,9 +12,6 @@ CONFIG_UNIX=y CONFIG_INET=y CONFIG_IP_PNP=y CONFIG_IP_PNP_BOOTP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_INET_DIAG is not set # CONFIG_IPV6 is not set CONFIG_MTD=y diff --git a/arch/mips/configs/lasat_defconfig b/arch/mips/configs/lasat_defconfig index c66ca37..38e6ad0 100644 --- a/arch/mips/configs/lasat_defconfig +++ b/arch/mips/configs/lasat_defconfig @@ -22,9 +22,6 @@ CONFIG_NET=y CONFIG_PACKET=y CONFIG_UNIX=y CONFIG_INET=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_INET_DIAG is not set # CONFIG_IPV6 is not set CONFIG_MTD=y diff --git a/arch/mips/configs/lemote2f_defconfig b/arch/mips/configs/lemote2f_defconfig index 300127b..cc0822d 100644 --- a/arch/mips/configs/lemote2f_defconfig +++ b/arch/mips/configs/lemote2f_defconfig @@ -44,9 +44,6 @@ CONFIG_IP_MROUTE=y CONFIG_IP_PIMSM_V1=y CONFIG_IP_PIMSM_V2=y CONFIG_SYN_COOKIES=y -CONFIG_INET_XFRM_MODE_TRANSPORT=m -CONFIG_INET_XFRM_MODE_TUNNEL=m -CONFIG_INET_XFRM_MODE_BEET=m CONFIG_TCP_CONG_ADVANCED=y CONFIG_TCP_CONG_BIC=y CONFIG_DEFAULT_BIC=y diff --git a/arch/mips/configs/loongson1b_defconfig b/arch/mips/configs/loongson1b_defconfig index 3d390a7..6a50057 100644 --- a/arch/mips/configs/loongson1b_defconfig +++ b/arch/mips/configs/loongson1b_defconfig @@ -28,9 +28,6 @@ CONFIG_INET=y CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y CONFIG_SYN_COOKIES=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_INET_DIAG is not set # CONFIG_IPV6 is not set # CONFIG_WIRELESS is not set diff --git a/arch/mips/configs/loongson1c_defconfig b/arch/mips/configs/loongson1c_defconfig index 247d56e..c33c727 100644 --- a/arch/mips/configs/loongson1c_defconfig +++ b/arch/mips/configs/loongson1c_defconfig @@ -29,9 +29,6 @@ CONFIG_INET=y CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y CONFIG_SYN_COOKIES=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_INET_DIAG is not set # CONFIG_IPV6 is not set # CONFIG_WIRELESS is not set diff --git a/arch/mips/configs/malta_defconfig b/arch/mips/configs/malta_defconfig index 0ee5e67..27c7f34 100644 --- a/arch/mips/configs/malta_defconfig +++ b/arch/mips/configs/malta_defconfig @@ -41,8 +41,6 @@ CONFIG_SYN_COOKIES=y CONFIG_INET_AH=m CONFIG_INET_ESP=m CONFIG_INET_IPCOMP=m -CONFIG_INET_XFRM_MODE_TRANSPORT=m -CONFIG_INET_XFRM_MODE_TUNNEL=m CONFIG_TCP_MD5SIG=y CONFIG_IPV6_ROUTER_PREF=y CONFIG_IPV6_ROUTE_INFO=y diff --git a/arch/mips/configs/malta_kvm_defconfig b/arch/mips/configs/malta_kvm_defconfig index 041bffa..dc4bb60 100644 --- a/arch/mips/configs/malta_kvm_defconfig +++ b/arch/mips/configs/malta_kvm_defconfig @@ -46,8 +46,6 @@ CONFIG_SYN_COOKIES=y CONFIG_INET_AH=m CONFIG_INET_ESP=m CONFIG_INET_IPCOMP=m -CONFIG_INET_XFRM_MODE_TRANSPORT=m -CONFIG_INET_XFRM_MODE_TUNNEL=m CONFIG_TCP_MD5SIG=y CONFIG_IPV6_ROUTER_PREF=y CONFIG_IPV6_ROUTE_INFO=y diff --git a/arch/mips/configs/malta_kvm_guest_defconfig b/arch/mips/configs/malta_kvm_guest_defconfig index 511065e..8304d34 100644 --- a/arch/mips/configs/malta_kvm_guest_defconfig +++ b/arch/mips/configs/malta_kvm_guest_defconfig @@ -43,8 +43,6 @@ CONFIG_SYN_COOKIES=y CONFIG_INET_AH=m CONFIG_INET_ESP=m CONFIG_INET_IPCOMP=m -CONFIG_INET_XFRM_MODE_TRANSPORT=m -CONFIG_INET_XFRM_MODE_TUNNEL=m CONFIG_TCP_MD5SIG=y CONFIG_IPV6_ROUTER_PREF=y CONFIG_IPV6_ROUTE_INFO=y diff --git a/arch/mips/configs/maltaup_xpa_defconfig b/arch/mips/configs/maltaup_xpa_defconfig index 6c026db..8ba7ae4 100644 --- a/arch/mips/configs/maltaup_xpa_defconfig +++ b/arch/mips/configs/maltaup_xpa_defconfig @@ -45,8 +45,6 @@ CONFIG_SYN_COOKIES=y CONFIG_INET_AH=m CONFIG_INET_ESP=m CONFIG_INET_IPCOMP=m -CONFIG_INET_XFRM_MODE_TRANSPORT=m -CONFIG_INET_XFRM_MODE_TUNNEL=m CONFIG_TCP_MD5SIG=y CONFIG_IPV6_ROUTER_PREF=y CONFIG_IPV6_ROUTE_INFO=y diff --git a/arch/mips/configs/markeins_defconfig b/arch/mips/configs/markeins_defconfig index ae93a94..d0d5b5d 100644 --- a/arch/mips/configs/markeins_defconfig +++ b/arch/mips/configs/markeins_defconfig @@ -28,12 +28,8 @@ CONFIG_IP_ROUTE_VERBOSE=y CONFIG_IP_PNP=y CONFIG_IP_PNP_BOOTP=y CONFIG_SYN_COOKIES=y -CONFIG_INET_XFRM_MODE_TRANSPORT=m -CONFIG_INET_XFRM_MODE_TUNNEL=m -CONFIG_INET_XFRM_MODE_BEET=m CONFIG_TCP_MD5SIG=y CONFIG_IPV6_MIP6=m -CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m CONFIG_IPV6_MULTIPLE_TABLES=y CONFIG_IPV6_SUBTREES=y CONFIG_NETWORK_SECMARK=y diff --git a/arch/mips/configs/mpc30x_defconfig b/arch/mips/configs/mpc30x_defconfig index d4e0388..1de4daa 100644 --- a/arch/mips/configs/mpc30x_defconfig +++ b/arch/mips/configs/mpc30x_defconfig @@ -18,9 +18,6 @@ CONFIG_NET_KEY=y CONFIG_NET_KEY_MIGRATE=y CONFIG_INET=y CONFIG_IP_MULTICAST=y -CONFIG_INET_XFRM_MODE_TRANSPORT=m -CONFIG_INET_XFRM_MODE_TUNNEL=m -CONFIG_INET_XFRM_MODE_BEET=m # CONFIG_IPV6 is not set CONFIG_NETWORK_SECMARK=y CONFIG_CONNECTOR=m diff --git a/arch/mips/configs/mtx1_defconfig b/arch/mips/configs/mtx1_defconfig index 16bef81..0ff94be 100644 --- a/arch/mips/configs/mtx1_defconfig +++ b/arch/mips/configs/mtx1_defconfig @@ -59,13 +59,9 @@ CONFIG_SYN_COOKIES=y CONFIG_INET_AH=m CONFIG_INET_ESP=m CONFIG_INET_IPCOMP=m -CONFIG_INET_XFRM_MODE_TRANSPORT=m -CONFIG_INET_XFRM_MODE_TUNNEL=m -CONFIG_INET_XFRM_MODE_BEET=m CONFIG_INET6_AH=m CONFIG_INET6_ESP=m CONFIG_INET6_IPCOMP=m -CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m CONFIG_IPV6_TUNNEL=m CONFIG_NETWORK_SECMARK=y CONFIG_NETFILTER=y diff --git a/arch/mips/configs/nlm_xlp_defconfig b/arch/mips/configs/nlm_xlp_defconfig index 72a211d..5372430 100644 --- a/arch/mips/configs/nlm_xlp_defconfig +++ b/arch/mips/configs/nlm_xlp_defconfig @@ -76,9 +76,6 @@ CONFIG_SYN_COOKIES=y CONFIG_INET_AH=m CONFIG_INET_ESP=m CONFIG_INET_IPCOMP=m -CONFIG_INET_XFRM_MODE_TRANSPORT=m -CONFIG_INET_XFRM_MODE_TUNNEL=m -CONFIG_INET_XFRM_MODE_BEET=m CONFIG_TCP_CONG_ADVANCED=y CONFIG_TCP_CONG_HSTCP=m CONFIG_TCP_CONG_HYBLA=m @@ -91,10 +88,6 @@ CONFIG_TCP_MD5SIG=y CONFIG_INET6_AH=m CONFIG_INET6_ESP=m CONFIG_INET6_IPCOMP=m -CONFIG_INET6_XFRM_MODE_TRANSPORT=m -CONFIG_INET6_XFRM_MODE_TUNNEL=m -CONFIG_INET6_XFRM_MODE_BEET=m -CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m CONFIG_IPV6_SIT=m CONFIG_IPV6_TUNNEL=m CONFIG_IPV6_MULTIPLE_TABLES=y diff --git a/arch/mips/configs/nlm_xlr_defconfig b/arch/mips/configs/nlm_xlr_defconfig index 4ecb157..41feef7 100644 --- a/arch/mips/configs/nlm_xlr_defconfig +++ b/arch/mips/configs/nlm_xlr_defconfig @@ -74,9 +74,6 @@ CONFIG_SYN_COOKIES=y CONFIG_INET_AH=m CONFIG_INET_ESP=m CONFIG_INET_IPCOMP=m -CONFIG_INET_XFRM_MODE_TRANSPORT=m -CONFIG_INET_XFRM_MODE_TUNNEL=m -CONFIG_INET_XFRM_MODE_BEET=m CONFIG_TCP_CONG_ADVANCED=y CONFIG_TCP_CONG_HSTCP=m CONFIG_TCP_CONG_HYBLA=m @@ -89,10 +86,6 @@ CONFIG_TCP_MD5SIG=y CONFIG_INET6_AH=m CONFIG_INET6_ESP=m CONFIG_INET6_IPCOMP=m -CONFIG_INET6_XFRM_MODE_TRANSPORT=m -CONFIG_INET6_XFRM_MODE_TUNNEL=m -CONFIG_INET6_XFRM_MODE_BEET=m -CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m CONFIG_IPV6_SIT=m CONFIG_IPV6_TUNNEL=m CONFIG_IPV6_MULTIPLE_TABLES=y diff --git a/arch/mips/configs/omega2p_defconfig b/arch/mips/configs/omega2p_defconfig index 0649b8f..5850c00 100644 --- a/arch/mips/configs/omega2p_defconfig +++ b/arch/mips/configs/omega2p_defconfig @@ -36,9 +36,6 @@ CONFIG_NET=y CONFIG_PACKET=y CONFIG_UNIX=y CONFIG_INET=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_INET_DIAG is not set # CONFIG_IPV6 is not set # CONFIG_WIRELESS is not set diff --git a/arch/mips/configs/pistachio_defconfig b/arch/mips/configs/pistachio_defconfig index 2f08d07..b649c84 100644 --- a/arch/mips/configs/pistachio_defconfig +++ b/arch/mips/configs/pistachio_defconfig @@ -55,9 +55,6 @@ CONFIG_SYN_COOKIES=y CONFIG_INET_AH=m CONFIG_INET_ESP=m CONFIG_INET_IPCOMP=m -CONFIG_INET_XFRM_MODE_TRANSPORT=m -CONFIG_INET_XFRM_MODE_TUNNEL=m -CONFIG_INET_XFRM_MODE_BEET=m # CONFIG_INET_DIAG is not set CONFIG_TCP_CONG_ADVANCED=y # CONFIG_TCP_CONG_BIC is not set @@ -67,9 +64,6 @@ CONFIG_TCP_CONG_LP=m CONFIG_TCP_MD5SIG=y CONFIG_INET6_AH=m CONFIG_INET6_ESP=m -CONFIG_INET6_XFRM_MODE_TRANSPORT=m -CONFIG_INET6_XFRM_MODE_TUNNEL=m -CONFIG_INET6_XFRM_MODE_BEET=m CONFIG_IPV6_SIT=m CONFIG_NETWORK_SECMARK=y CONFIG_NETFILTER=y diff --git a/arch/mips/configs/qi_lb60_defconfig b/arch/mips/configs/qi_lb60_defconfig index 1a0677d..dbf1415 100644 --- a/arch/mips/configs/qi_lb60_defconfig +++ b/arch/mips/configs/qi_lb60_defconfig @@ -31,9 +31,6 @@ CONFIG_IP_ROUTE_MULTIPATH=y CONFIG_IP_ROUTE_VERBOSE=y CONFIG_IP_MROUTE=y CONFIG_IP_MROUTE_MULTIPLE_TABLES=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_INET_DIAG is not set CONFIG_TCP_CONG_ADVANCED=y # CONFIG_TCP_CONG_BIC is not set diff --git a/arch/mips/configs/rb532_defconfig b/arch/mips/configs/rb532_defconfig index 50632a3..1e6cde1 100644 --- a/arch/mips/configs/rb532_defconfig +++ b/arch/mips/configs/rb532_defconfig @@ -34,9 +34,6 @@ CONFIG_IP_MULTIPLE_TABLES=y CONFIG_IP_ROUTE_MULTIPATH=y CONFIG_IP_ROUTE_VERBOSE=y CONFIG_SYN_COOKIES=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set CONFIG_INET_DIAG=m CONFIG_TCP_CONG_ADVANCED=y CONFIG_TCP_CONG_CUBIC=m diff --git a/arch/mips/configs/rbtx49xx_defconfig b/arch/mips/configs/rbtx49xx_defconfig index 5e389db..df64253 100644 --- a/arch/mips/configs/rbtx49xx_defconfig +++ b/arch/mips/configs/rbtx49xx_defconfig @@ -24,9 +24,6 @@ CONFIG_UNIX=y CONFIG_INET=y CONFIG_IP_MULTICAST=y CONFIG_IP_PNP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_IPV6 is not set # CONFIG_WIRELESS is not set CONFIG_MTD=y diff --git a/arch/mips/configs/rm200_defconfig b/arch/mips/configs/rm200_defconfig index 0f4b09f..82f24a8 100644 --- a/arch/mips/configs/rm200_defconfig +++ b/arch/mips/configs/rm200_defconfig @@ -29,9 +29,6 @@ CONFIG_NET_IPIP=m CONFIG_IP_MROUTE=y CONFIG_IP_PIMSM_V1=y CONFIG_IP_PIMSM_V2=y -CONFIG_INET_XFRM_MODE_TRANSPORT=m -CONFIG_INET_XFRM_MODE_TUNNEL=m -CONFIG_INET_XFRM_MODE_BEET=m CONFIG_TCP_MD5SIG=y CONFIG_IPV6_ROUTER_PREF=y CONFIG_IPV6_ROUTE_INFO=y @@ -39,7 +36,6 @@ CONFIG_INET6_AH=m CONFIG_INET6_ESP=m CONFIG_INET6_IPCOMP=m CONFIG_IPV6_MIP6=m -CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m CONFIG_IPV6_TUNNEL=m CONFIG_IPV6_MULTIPLE_TABLES=y CONFIG_IPV6_SUBTREES=y diff --git a/arch/mips/configs/rt305x_defconfig b/arch/mips/configs/rt305x_defconfig index 0392e38..efa0859 100644 --- a/arch/mips/configs/rt305x_defconfig +++ b/arch/mips/configs/rt305x_defconfig @@ -36,9 +36,6 @@ CONFIG_IP_ROUTE_VERBOSE=y CONFIG_IP_MROUTE=y CONFIG_IP_MROUTE_MULTIPLE_TABLES=y CONFIG_SYN_COOKIES=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_INET_DIAG is not set CONFIG_TCP_CONG_ADVANCED=y # CONFIG_TCP_CONG_BIC is not set diff --git a/arch/mips/configs/sb1250_swarm_defconfig b/arch/mips/configs/sb1250_swarm_defconfig index ad89816..4b74201 100644 --- a/arch/mips/configs/sb1250_swarm_defconfig +++ b/arch/mips/configs/sb1250_swarm_defconfig @@ -34,9 +34,6 @@ CONFIG_INET=y CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y CONFIG_IP_PNP_BOOTP=y -CONFIG_INET_XFRM_MODE_TRANSPORT=m -CONFIG_INET_XFRM_MODE_TUNNEL=m -CONFIG_INET_XFRM_MODE_BEET=m CONFIG_TCP_MD5SIG=y # CONFIG_IPV6 is not set CONFIG_NETWORK_SECMARK=y diff --git a/arch/mips/configs/tb0219_defconfig b/arch/mips/configs/tb0219_defconfig index f0a11a7..b835acb 100644 --- a/arch/mips/configs/tb0219_defconfig +++ b/arch/mips/configs/tb0219_defconfig @@ -23,9 +23,6 @@ CONFIG_IP_PNP=y CONFIG_IP_PNP_BOOTP=y CONFIG_NET_IPIP=m CONFIG_SYN_COOKIES=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_IPV6 is not set CONFIG_NETWORK_SECMARK=y CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" diff --git a/arch/mips/configs/tb0226_defconfig b/arch/mips/configs/tb0226_defconfig index 025e456..da2f46a 100644 --- a/arch/mips/configs/tb0226_defconfig +++ b/arch/mips/configs/tb0226_defconfig @@ -21,9 +21,6 @@ CONFIG_IP_ROUTE_VERBOSE=y CONFIG_IP_PNP=y CONFIG_IP_PNP_BOOTP=y CONFIG_SYN_COOKIES=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_IPV6 is not set CONFIG_NETWORK_SECMARK=y CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" diff --git a/arch/mips/configs/tb0287_defconfig b/arch/mips/configs/tb0287_defconfig index 6849024..9eb4626 100644 --- a/arch/mips/configs/tb0287_defconfig +++ b/arch/mips/configs/tb0287_defconfig @@ -22,9 +22,6 @@ CONFIG_IP_PNP=y CONFIG_IP_PNP_BOOTP=y CONFIG_NET_IPIP=m CONFIG_SYN_COOKIES=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set CONFIG_TCP_CONG_ADVANCED=y CONFIG_TCP_CONG_BIC=y CONFIG_TCP_CONG_CUBIC=m diff --git a/arch/mips/configs/vocore2_defconfig b/arch/mips/configs/vocore2_defconfig index ded3dce..e7dc5c4 100644 --- a/arch/mips/configs/vocore2_defconfig +++ b/arch/mips/configs/vocore2_defconfig @@ -36,9 +36,6 @@ CONFIG_NET=y CONFIG_PACKET=y CONFIG_UNIX=y CONFIG_INET=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_INET_DIAG is not set # CONFIG_IPV6 is not set # CONFIG_WIRELESS is not set diff --git a/arch/mips/configs/workpad_defconfig b/arch/mips/configs/workpad_defconfig index 891a5f7..520ee46 100644 --- a/arch/mips/configs/workpad_defconfig +++ b/arch/mips/configs/workpad_defconfig @@ -20,9 +20,6 @@ CONFIG_NET_KEY=y CONFIG_NET_KEY_MIGRATE=y CONFIG_INET=y CONFIG_IP_MULTICAST=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_IPV6 is not set CONFIG_NETWORK_SECMARK=y CONFIG_BLK_DEV_RAM=m diff --git a/arch/mips/configs/xway_defconfig b/arch/mips/configs/xway_defconfig index 203db83..c022091 100644 --- a/arch/mips/configs/xway_defconfig +++ b/arch/mips/configs/xway_defconfig @@ -38,9 +38,6 @@ CONFIG_IP_ROUTE_VERBOSE=y CONFIG_IP_MROUTE=y CONFIG_IP_MROUTE_MULTIPLE_TABLES=y CONFIG_SYN_COOKIES=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_INET_DIAG is not set CONFIG_TCP_CONG_ADVANCED=y # CONFIG_TCP_CONG_BIC is not set diff --git a/arch/nios2/configs/10m50_defconfig b/arch/nios2/configs/10m50_defconfig index 7977ab7..112f7ae 100644 --- a/arch/nios2/configs/10m50_defconfig +++ b/arch/nios2/configs/10m50_defconfig @@ -30,9 +30,6 @@ CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y CONFIG_IP_PNP_BOOTP=y CONFIG_IP_PNP_RARP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_IPV6 is not set # CONFIG_WIRELESS is not set CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" diff --git a/arch/nios2/configs/3c120_defconfig b/arch/nios2/configs/3c120_defconfig index ceb97cd..30524d8 100644 --- a/arch/nios2/configs/3c120_defconfig +++ b/arch/nios2/configs/3c120_defconfig @@ -32,9 +32,6 @@ CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y CONFIG_IP_PNP_BOOTP=y CONFIG_IP_PNP_RARP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_IPV6 is not set # CONFIG_WIRELESS is not set CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" diff --git a/arch/openrisc/configs/or1ksim_defconfig b/arch/openrisc/configs/or1ksim_defconfig index d8ff4f8..c8d67a3 100644 --- a/arch/openrisc/configs/or1ksim_defconfig +++ b/arch/openrisc/configs/or1ksim_defconfig @@ -20,9 +20,6 @@ CONFIG_NET=y CONFIG_PACKET=y CONFIG_UNIX=y CONFIG_INET=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_INET_DIAG is not set CONFIG_TCP_CONG_ADVANCED=y # CONFIG_TCP_CONG_BIC is not set diff --git a/arch/openrisc/configs/simple_smp_defconfig b/arch/openrisc/configs/simple_smp_defconfig index 6427899..8fe55ce 100644 --- a/arch/openrisc/configs/simple_smp_defconfig +++ b/arch/openrisc/configs/simple_smp_defconfig @@ -28,9 +28,6 @@ CONFIG_NET=y CONFIG_PACKET=y CONFIG_UNIX=y CONFIG_INET=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_INET_DIAG is not set CONFIG_TCP_CONG_ADVANCED=y # CONFIG_TCP_CONG_BIC is not set diff --git a/arch/parisc/configs/c8000_defconfig b/arch/parisc/configs/c8000_defconfig index 507f064..2b543ee 100644 --- a/arch/parisc/configs/c8000_defconfig +++ b/arch/parisc/configs/c8000_defconfig @@ -49,7 +49,6 @@ CONFIG_SYN_COOKIES=y CONFIG_INET_AH=m CONFIG_INET_ESP=m CONFIG_INET_IPCOMP=m -CONFIG_INET_XFRM_MODE_BEET=m CONFIG_INET_DIAG=m # CONFIG_IPV6 is not set CONFIG_IP_DCCP=m diff --git a/arch/parisc/configs/generic-32bit_defconfig b/arch/parisc/configs/generic-32bit_defconfig index 18b072a..632ca1a 100644 --- a/arch/parisc/configs/generic-32bit_defconfig +++ b/arch/parisc/configs/generic-32bit_defconfig @@ -41,9 +41,6 @@ CONFIG_IP_PNP=y CONFIG_IP_PNP_BOOTP=y CONFIG_INET_AH=m CONFIG_INET_ESP=m -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set CONFIG_INET_DIAG=m CONFIG_LLC2=m # CONFIG_WIRELESS is not set diff --git a/arch/parisc/configs/generic-64bit_defconfig b/arch/parisc/configs/generic-64bit_defconfig index d39e7f8..8ed7043 100644 --- a/arch/parisc/configs/generic-64bit_defconfig +++ b/arch/parisc/configs/generic-64bit_defconfig @@ -50,9 +50,6 @@ CONFIG_IP_PNP=y CONFIG_IP_PNP_BOOTP=y CONFIG_INET_AH=m CONFIG_INET_ESP=m -CONFIG_INET_XFRM_MODE_TRANSPORT=m -CONFIG_INET_XFRM_MODE_TUNNEL=m -CONFIG_INET_XFRM_MODE_BEET=m CONFIG_INET_DIAG=m CONFIG_NETFILTER=y # CONFIG_NETFILTER_ADVANCED is not set diff --git a/arch/powerpc/configs/40x/acadia_defconfig b/arch/powerpc/configs/40x/acadia_defconfig index e57344c..58b07f8 100644 --- a/arch/powerpc/configs/40x/acadia_defconfig +++ b/arch/powerpc/configs/40x/acadia_defconfig @@ -18,9 +18,6 @@ CONFIG_INET=y CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y CONFIG_IP_PNP_BOOTP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_IPV6 is not set CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" CONFIG_CONNECTOR=y diff --git a/arch/powerpc/configs/40x/ep405_defconfig b/arch/powerpc/configs/40x/ep405_defconfig index 0f66f8a..164ec2d 100644 --- a/arch/powerpc/configs/40x/ep405_defconfig +++ b/arch/powerpc/configs/40x/ep405_defconfig @@ -17,9 +17,6 @@ CONFIG_INET=y CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y CONFIG_IP_PNP_BOOTP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_IPV6 is not set CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" CONFIG_CONNECTOR=y diff --git a/arch/powerpc/configs/40x/kilauea_defconfig b/arch/powerpc/configs/40x/kilauea_defconfig index 3da091f..003bc3c 100644 --- a/arch/powerpc/configs/40x/kilauea_defconfig +++ b/arch/powerpc/configs/40x/kilauea_defconfig @@ -20,9 +20,6 @@ CONFIG_INET=y CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y CONFIG_IP_PNP_BOOTP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_IPV6 is not set CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" CONFIG_CONNECTOR=y diff --git a/arch/powerpc/configs/40x/makalu_defconfig b/arch/powerpc/configs/40x/makalu_defconfig index e0b1489..0ab2b58 100644 --- a/arch/powerpc/configs/40x/makalu_defconfig +++ b/arch/powerpc/configs/40x/makalu_defconfig @@ -17,9 +17,6 @@ CONFIG_INET=y CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y CONFIG_IP_PNP_BOOTP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_IPV6 is not set CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" CONFIG_CONNECTOR=y diff --git a/arch/powerpc/configs/40x/obs600_defconfig b/arch/powerpc/configs/40x/obs600_defconfig index 38d3d77..a5eea76 100644 --- a/arch/powerpc/configs/40x/obs600_defconfig +++ b/arch/powerpc/configs/40x/obs600_defconfig @@ -20,9 +20,6 @@ CONFIG_INET=y CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y CONFIG_IP_PNP_BOOTP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_IPV6 is not set CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" CONFIG_CONNECTOR=y diff --git a/arch/powerpc/configs/40x/walnut_defconfig b/arch/powerpc/configs/40x/walnut_defconfig index 6faa03c..935cb3c 100644 --- a/arch/powerpc/configs/40x/walnut_defconfig +++ b/arch/powerpc/configs/40x/walnut_defconfig @@ -15,9 +15,6 @@ CONFIG_INET=y CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y CONFIG_IP_PNP_BOOTP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_IPV6 is not set CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" CONFIG_CONNECTOR=y diff --git a/arch/powerpc/configs/44x/akebono_defconfig b/arch/powerpc/configs/44x/akebono_defconfig index 9fcd361..a1879e4 100644 --- a/arch/powerpc/configs/44x/akebono_defconfig +++ b/arch/powerpc/configs/44x/akebono_defconfig @@ -29,9 +29,6 @@ CONFIG_INET=y CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y CONFIG_IP_PNP_BOOTP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_IPV6 is not set CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" CONFIG_DEVTMPFS=y diff --git a/arch/powerpc/configs/44x/arches_defconfig b/arch/powerpc/configs/44x/arches_defconfig index 6bba1a5..f66fe97 100644 --- a/arch/powerpc/configs/44x/arches_defconfig +++ b/arch/powerpc/configs/44x/arches_defconfig @@ -20,9 +20,6 @@ CONFIG_INET=y CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y CONFIG_IP_PNP_BOOTP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_IPV6 is not set CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" CONFIG_CONNECTOR=y diff --git a/arch/powerpc/configs/44x/bamboo_defconfig b/arch/powerpc/configs/44x/bamboo_defconfig index 6f3a6ec..c4cc678 100644 --- a/arch/powerpc/configs/44x/bamboo_defconfig +++ b/arch/powerpc/configs/44x/bamboo_defconfig @@ -18,9 +18,6 @@ CONFIG_INET=y CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y CONFIG_IP_PNP_BOOTP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_IPV6 is not set CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" CONFIG_CONNECTOR=y diff --git a/arch/powerpc/configs/44x/canyonlands_defconfig b/arch/powerpc/configs/44x/canyonlands_defconfig index d427cee..70eeb26 100644 --- a/arch/powerpc/configs/44x/canyonlands_defconfig +++ b/arch/powerpc/configs/44x/canyonlands_defconfig @@ -20,9 +20,6 @@ CONFIG_INET=y CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y CONFIG_IP_PNP_BOOTP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_IPV6 is not set CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" CONFIG_CONNECTOR=y diff --git a/arch/powerpc/configs/44x/currituck_defconfig b/arch/powerpc/configs/44x/currituck_defconfig index 5f1df5f..74f1432b5 100644 --- a/arch/powerpc/configs/44x/currituck_defconfig +++ b/arch/powerpc/configs/44x/currituck_defconfig @@ -27,9 +27,6 @@ CONFIG_INET=y CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y CONFIG_IP_PNP_BOOTP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_IPV6 is not set CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" CONFIG_DEVTMPFS=y diff --git a/arch/powerpc/configs/44x/ebony_defconfig b/arch/powerpc/configs/44x/ebony_defconfig index e2b6578..ce6d213 100644 --- a/arch/powerpc/configs/44x/ebony_defconfig +++ b/arch/powerpc/configs/44x/ebony_defconfig @@ -16,9 +16,6 @@ CONFIG_INET=y CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y CONFIG_IP_PNP_BOOTP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_IPV6 is not set CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" CONFIG_CONNECTOR=y diff --git a/arch/powerpc/configs/44x/eiger_defconfig b/arch/powerpc/configs/44x/eiger_defconfig index f593258..b8ebe34 100644 --- a/arch/powerpc/configs/44x/eiger_defconfig +++ b/arch/powerpc/configs/44x/eiger_defconfig @@ -21,9 +21,6 @@ CONFIG_INET=y CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y CONFIG_IP_PNP_BOOTP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_IPV6 is not set CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" CONFIG_CONNECTOR=y diff --git a/arch/powerpc/configs/44x/fsp2_defconfig b/arch/powerpc/configs/44x/fsp2_defconfig index bae6b26..65c65b9 100644 --- a/arch/powerpc/configs/44x/fsp2_defconfig +++ b/arch/powerpc/configs/44x/fsp2_defconfig @@ -39,9 +39,6 @@ CONFIG_INET=y CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y CONFIG_IP_PNP_BOOTP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_IPV6 is not set CONFIG_VLAN_8021Q=m CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" diff --git a/arch/powerpc/configs/44x/icon_defconfig b/arch/powerpc/configs/44x/icon_defconfig index 4453a45..b638247 100644 --- a/arch/powerpc/configs/44x/icon_defconfig +++ b/arch/powerpc/configs/44x/icon_defconfig @@ -20,9 +20,6 @@ CONFIG_INET=y CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y CONFIG_IP_PNP_BOOTP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_IPV6 is not set CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" CONFIG_CONNECTOR=y diff --git a/arch/powerpc/configs/44x/iss476-smp_defconfig b/arch/powerpc/configs/44x/iss476-smp_defconfig index d24bfa6..166d7cd 100644 --- a/arch/powerpc/configs/44x/iss476-smp_defconfig +++ b/arch/powerpc/configs/44x/iss476-smp_defconfig @@ -29,9 +29,6 @@ CONFIG_INET=y CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y CONFIG_IP_PNP_BOOTP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_IPV6 is not set CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" CONFIG_CONNECTOR=y diff --git a/arch/powerpc/configs/44x/katmai_defconfig b/arch/powerpc/configs/44x/katmai_defconfig index 5d3f685..d78ad46 100644 --- a/arch/powerpc/configs/44x/katmai_defconfig +++ b/arch/powerpc/configs/44x/katmai_defconfig @@ -18,9 +18,6 @@ CONFIG_INET=y CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y CONFIG_IP_PNP_BOOTP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_IPV6 is not set CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" CONFIG_CONNECTOR=y diff --git a/arch/powerpc/configs/44x/rainier_defconfig b/arch/powerpc/configs/44x/rainier_defconfig index 7b8355a..f02b2a6 100644 --- a/arch/powerpc/configs/44x/rainier_defconfig +++ b/arch/powerpc/configs/44x/rainier_defconfig @@ -19,9 +19,6 @@ CONFIG_INET=y CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y CONFIG_IP_PNP_BOOTP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_IPV6 is not set CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" CONFIG_CONNECTOR=y diff --git a/arch/powerpc/configs/44x/redwood_defconfig b/arch/powerpc/configs/44x/redwood_defconfig index 918cfb6..4131804 100644 --- a/arch/powerpc/configs/44x/redwood_defconfig +++ b/arch/powerpc/configs/44x/redwood_defconfig @@ -21,9 +21,6 @@ CONFIG_INET=y CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y CONFIG_IP_PNP_BOOTP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_IPV6 is not set CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" CONFIG_CONNECTOR=y diff --git a/arch/powerpc/configs/44x/sam440ep_defconfig b/arch/powerpc/configs/44x/sam440ep_defconfig index 63302fb..399cff3 100644 --- a/arch/powerpc/configs/44x/sam440ep_defconfig +++ b/arch/powerpc/configs/44x/sam440ep_defconfig @@ -23,9 +23,6 @@ CONFIG_INET=y CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y CONFIG_IP_PNP_BOOTP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_IPV6 is not set CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" CONFIG_CONNECTOR=y diff --git a/arch/powerpc/configs/44x/sequoia_defconfig b/arch/powerpc/configs/44x/sequoia_defconfig index f34fee9..9e76d9b 100644 --- a/arch/powerpc/configs/44x/sequoia_defconfig +++ b/arch/powerpc/configs/44x/sequoia_defconfig @@ -20,9 +20,6 @@ CONFIG_INET=y CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y CONFIG_IP_PNP_BOOTP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_IPV6 is not set CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" CONFIG_CONNECTOR=y diff --git a/arch/powerpc/configs/44x/taishan_defconfig b/arch/powerpc/configs/44x/taishan_defconfig index 42cc7b4..151b4e3 100644 --- a/arch/powerpc/configs/44x/taishan_defconfig +++ b/arch/powerpc/configs/44x/taishan_defconfig @@ -18,9 +18,6 @@ CONFIG_INET=y CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y CONFIG_IP_PNP_BOOTP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_IPV6 is not set CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" CONFIG_CONNECTOR=y diff --git a/arch/powerpc/configs/52xx/pcm030_defconfig b/arch/powerpc/configs/52xx/pcm030_defconfig index 1554de6..5d5e97a 100644 --- a/arch/powerpc/configs/52xx/pcm030_defconfig +++ b/arch/powerpc/configs/52xx/pcm030_defconfig @@ -31,9 +31,6 @@ CONFIG_IP_MULTICAST=y CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y CONFIG_IP_PNP_BOOTP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_INET_DIAG is not set # CONFIG_IPV6 is not set CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" diff --git a/arch/powerpc/configs/83xx/kmeter1_defconfig b/arch/powerpc/configs/83xx/kmeter1_defconfig index d21b5cb..648c6b3 100644 --- a/arch/powerpc/configs/83xx/kmeter1_defconfig +++ b/arch/powerpc/configs/83xx/kmeter1_defconfig @@ -25,9 +25,6 @@ CONFIG_UNIX=y CONFIG_INET=y CONFIG_IP_MULTICAST=y CONFIG_IP_PNP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_IPV6 is not set CONFIG_TIPC=y CONFIG_BRIDGE=m diff --git a/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig b/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig index 8966a9a..9f21207 100644 --- a/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig +++ b/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig @@ -22,9 +22,6 @@ CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y CONFIG_IP_PNP_BOOTP=y CONFIG_SYN_COOKIES=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_IPV6 is not set CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" # CONFIG_FW_LOADER is not set diff --git a/arch/powerpc/configs/85xx/ge_imp3a_defconfig b/arch/powerpc/configs/85xx/ge_imp3a_defconfig index d70b603..370484f 100644 --- a/arch/powerpc/configs/85xx/ge_imp3a_defconfig +++ b/arch/powerpc/configs/85xx/ge_imp3a_defconfig @@ -60,7 +60,6 @@ CONFIG_SYN_COOKIES=y CONFIG_INET_AH=m CONFIG_INET_ESP=m CONFIG_INET_IPCOMP=m -# CONFIG_INET_XFRM_MODE_BEET is not set CONFIG_INET6_AH=m CONFIG_INET6_IPCOMP=m CONFIG_IPV6_TUNNEL=m diff --git a/arch/powerpc/configs/85xx/xes_mpc85xx_defconfig b/arch/powerpc/configs/85xx/xes_mpc85xx_defconfig index 78f5beb..69da3af 100644 --- a/arch/powerpc/configs/85xx/xes_mpc85xx_defconfig +++ b/arch/powerpc/configs/85xx/xes_mpc85xx_defconfig @@ -51,9 +51,6 @@ CONFIG_NET_IPIP=y CONFIG_IP_MROUTE=y CONFIG_IP_PIMSM_V1=y CONFIG_IP_PIMSM_V2=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" CONFIG_MTD=y CONFIG_MTD_REDBOOT_PARTS=y diff --git a/arch/powerpc/configs/adder875_defconfig b/arch/powerpc/configs/adder875_defconfig index 935ea3ad..0607348 100644 --- a/arch/powerpc/configs/adder875_defconfig +++ b/arch/powerpc/configs/adder875_defconfig @@ -22,9 +22,6 @@ CONFIG_INET=y CONFIG_IP_MULTICAST=y CONFIG_IP_PNP=y CONFIG_SYN_COOKIES=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_IPV6 is not set CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" # CONFIG_FW_LOADER is not set diff --git a/arch/powerpc/configs/amigaone_defconfig b/arch/powerpc/configs/amigaone_defconfig index 12f397d..a5bbdbf 100644 --- a/arch/powerpc/configs/amigaone_defconfig +++ b/arch/powerpc/configs/amigaone_defconfig @@ -26,9 +26,6 @@ CONFIG_UNIX=y CONFIG_INET=y CONFIG_IP_MULTICAST=y CONFIG_SYN_COOKIES=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_IPV6 is not set CONFIG_NETFILTER=y # CONFIG_NETFILTER_ADVANCED is not set diff --git a/arch/powerpc/configs/cell_defconfig b/arch/powerpc/configs/cell_defconfig index 560a93a..3c4137f 100644 --- a/arch/powerpc/configs/cell_defconfig +++ b/arch/powerpc/configs/cell_defconfig @@ -51,11 +51,9 @@ CONFIG_IP_PNP_BOOTP=y CONFIG_IP_PNP_RARP=y CONFIG_NET_IPIP=y CONFIG_SYN_COOKIES=y -# CONFIG_INET_XFRM_MODE_BEET is not set CONFIG_INET6_AH=m CONFIG_INET6_ESP=m CONFIG_INET6_IPCOMP=m -# CONFIG_INET6_XFRM_MODE_BEET is not set # CONFIG_IPV6_SIT is not set CONFIG_IPV6_TUNNEL=m CONFIG_NETFILTER=y diff --git a/arch/powerpc/configs/chrp32_defconfig b/arch/powerpc/configs/chrp32_defconfig index a203b1c..d7be87f 100644 --- a/arch/powerpc/configs/chrp32_defconfig +++ b/arch/powerpc/configs/chrp32_defconfig @@ -27,9 +27,6 @@ CONFIG_UNIX=y CONFIG_INET=y CONFIG_IP_MULTICAST=y CONFIG_SYN_COOKIES=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_IPV6 is not set CONFIG_NETFILTER=y # CONFIG_NETFILTER_ADVANCED is not set diff --git a/arch/powerpc/configs/ep88xc_defconfig b/arch/powerpc/configs/ep88xc_defconfig index 7cb590e..1200461 100644 --- a/arch/powerpc/configs/ep88xc_defconfig +++ b/arch/powerpc/configs/ep88xc_defconfig @@ -24,9 +24,6 @@ CONFIG_INET=y CONFIG_IP_MULTICAST=y CONFIG_IP_PNP=y CONFIG_SYN_COOKIES=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_IPV6 is not set CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" # CONFIG_FW_LOADER is not set diff --git a/arch/powerpc/configs/gamecube_defconfig b/arch/powerpc/configs/gamecube_defconfig index 805b0f8..9470ccd 100644 --- a/arch/powerpc/configs/gamecube_defconfig +++ b/arch/powerpc/configs/gamecube_defconfig @@ -29,9 +29,6 @@ CONFIG_INET=y CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y CONFIG_IP_PNP_RARP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_INET_DIAG is not set # CONFIG_IPV6 is not set # CONFIG_WIRELESS is not set diff --git a/arch/powerpc/configs/mpc512x_defconfig b/arch/powerpc/configs/mpc512x_defconfig index e4bf8aa..4c7c721 100644 --- a/arch/powerpc/configs/mpc512x_defconfig +++ b/arch/powerpc/configs/mpc512x_defconfig @@ -25,9 +25,6 @@ CONFIG_PACKET=y CONFIG_UNIX=y CONFIG_INET=y CONFIG_IP_PNP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_INET_DIAG is not set # CONFIG_IPV6 is not set CONFIG_CAN=y diff --git a/arch/powerpc/configs/mpc885_ads_defconfig b/arch/powerpc/configs/mpc885_ads_defconfig index ec3fcc2..0eacbf6 100644 --- a/arch/powerpc/configs/mpc885_ads_defconfig +++ b/arch/powerpc/configs/mpc885_ads_defconfig @@ -23,9 +23,6 @@ CONFIG_INET=y CONFIG_IP_MULTICAST=y CONFIG_IP_PNP=y CONFIG_SYN_COOKIES=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_IPV6 is not set CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" # CONFIG_FW_LOADER is not set diff --git a/arch/powerpc/configs/pmac32_defconfig b/arch/powerpc/configs/pmac32_defconfig index 50b610b..866bcc9 100644 --- a/arch/powerpc/configs/pmac32_defconfig +++ b/arch/powerpc/configs/pmac32_defconfig @@ -39,8 +39,6 @@ CONFIG_IP_MULTICAST=y CONFIG_SYN_COOKIES=y CONFIG_INET_AH=y CONFIG_INET_ESP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set # CONFIG_IPV6 is not set CONFIG_NETFILTER=y CONFIG_NF_CONNTRACK=m diff --git a/arch/powerpc/configs/powernv_defconfig b/arch/powerpc/configs/powernv_defconfig index ef2ef98..bf37a2d 100644 --- a/arch/powerpc/configs/powernv_defconfig +++ b/arch/powerpc/configs/powernv_defconfig @@ -83,9 +83,6 @@ CONFIG_INET_IPCOMP=m CONFIG_INET6_AH=m CONFIG_INET6_ESP=m CONFIG_INET6_IPCOMP=m -CONFIG_INET6_XFRM_MODE_TRANSPORT=m -CONFIG_INET6_XFRM_MODE_TUNNEL=m -CONFIG_INET6_XFRM_MODE_BEET=m CONFIG_IPV6_SIT=m CONFIG_NETFILTER=y # CONFIG_NETFILTER_ADVANCED is not set diff --git a/arch/powerpc/configs/ppc40x_defconfig b/arch/powerpc/configs/ppc40x_defconfig index 689d7e2..b534637 100644 --- a/arch/powerpc/configs/ppc40x_defconfig +++ b/arch/powerpc/configs/ppc40x_defconfig @@ -22,9 +22,6 @@ CONFIG_INET=y CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y CONFIG_IP_PNP_BOOTP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" CONFIG_CONNECTOR=y CONFIG_MTD=y diff --git a/arch/powerpc/configs/ppc44x_defconfig b/arch/powerpc/configs/ppc44x_defconfig index db48039..b3ec47a 100644 --- a/arch/powerpc/configs/ppc44x_defconfig +++ b/arch/powerpc/configs/ppc44x_defconfig @@ -32,9 +32,6 @@ CONFIG_INET=y CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y CONFIG_IP_PNP_BOOTP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set CONFIG_BRIDGE=m CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" CONFIG_CONNECTOR=y diff --git a/arch/powerpc/configs/ppc6xx_defconfig b/arch/powerpc/configs/ppc6xx_defconfig index 7c6baf6..1278d50 100644 --- a/arch/powerpc/configs/ppc6xx_defconfig +++ b/arch/powerpc/configs/ppc6xx_defconfig @@ -109,9 +109,6 @@ CONFIG_SYN_COOKIES=y CONFIG_INET_AH=m CONFIG_INET_ESP=m CONFIG_INET_IPCOMP=m -CONFIG_INET_XFRM_MODE_TRANSPORT=m -CONFIG_INET_XFRM_MODE_TUNNEL=m -CONFIG_INET_XFRM_MODE_BEET=m CONFIG_INET_DIAG=m CONFIG_TCP_CONG_ADVANCED=y CONFIG_TCP_CONG_HSTCP=m @@ -129,7 +126,6 @@ CONFIG_INET6_AH=m CONFIG_INET6_ESP=m CONFIG_INET6_IPCOMP=m CONFIG_IPV6_MIP6=m -CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m CONFIG_IPV6_TUNNEL=m CONFIG_IPV6_MULTIPLE_TABLES=y CONFIG_IPV6_SUBTREES=y diff --git a/arch/powerpc/configs/ps3_defconfig b/arch/powerpc/configs/ps3_defconfig index cf8d55f..22b8466 100644 --- a/arch/powerpc/configs/ps3_defconfig +++ b/arch/powerpc/configs/ps3_defconfig @@ -47,9 +47,6 @@ CONFIG_INET=y CONFIG_IP_MULTICAST=y CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_INET_DIAG is not set CONFIG_BT=m CONFIG_BT_RFCOMM=m diff --git a/arch/powerpc/configs/skiroot_defconfig b/arch/powerpc/configs/skiroot_defconfig index a887616..5bb0894 100644 --- a/arch/powerpc/configs/skiroot_defconfig +++ b/arch/powerpc/configs/skiroot_defconfig @@ -63,9 +63,6 @@ CONFIG_INET=y CONFIG_IP_MULTICAST=y CONFIG_NET_IPIP=y CONFIG_SYN_COOKIES=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set CONFIG_DNS_RESOLVER=y # CONFIG_WIRELESS is not set CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" diff --git a/arch/powerpc/configs/storcenter_defconfig b/arch/powerpc/configs/storcenter_defconfig index 74bca2e..a8f9ff5 100644 --- a/arch/powerpc/configs/storcenter_defconfig +++ b/arch/powerpc/configs/storcenter_defconfig @@ -22,9 +22,6 @@ CONFIG_INET=y CONFIG_IP_MULTICAST=y CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_IPV6 is not set CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" CONFIG_MTD=y diff --git a/arch/powerpc/configs/tqm8xx_defconfig b/arch/powerpc/configs/tqm8xx_defconfig index cd72193..b08f1cf 100644 --- a/arch/powerpc/configs/tqm8xx_defconfig +++ b/arch/powerpc/configs/tqm8xx_defconfig @@ -27,9 +27,6 @@ CONFIG_UNIX=y CONFIG_INET=y CONFIG_IP_PNP=y CONFIG_SYN_COOKIES=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_IPV6 is not set # CONFIG_WIRELESS is not set CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" diff --git a/arch/powerpc/configs/wii_defconfig b/arch/powerpc/configs/wii_defconfig index f5c366b..7117e9e 100644 --- a/arch/powerpc/configs/wii_defconfig +++ b/arch/powerpc/configs/wii_defconfig @@ -29,9 +29,6 @@ CONFIG_INET=y CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y CONFIG_IP_PNP_RARP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_INET_DIAG is not set # CONFIG_IPV6 is not set CONFIG_BT=y diff --git a/arch/s390/configs/debug_defconfig b/arch/s390/configs/debug_defconfig index b0920b3..59fbd4b 100644 --- a/arch/s390/configs/debug_defconfig +++ b/arch/s390/configs/debug_defconfig @@ -120,9 +120,6 @@ CONFIG_NET_IPVTI=m CONFIG_INET_AH=m CONFIG_INET_ESP=m CONFIG_INET_IPCOMP=m -CONFIG_INET_XFRM_MODE_TRANSPORT=m -CONFIG_INET_XFRM_MODE_TUNNEL=m -CONFIG_INET_XFRM_MODE_BEET=m CONFIG_INET_DIAG=m CONFIG_INET_UDP_DIAG=m CONFIG_TCP_CONG_ADVANCED=y @@ -138,10 +135,6 @@ CONFIG_INET6_AH=m CONFIG_INET6_ESP=m CONFIG_INET6_IPCOMP=m CONFIG_IPV6_MIP6=m -CONFIG_INET6_XFRM_MODE_TRANSPORT=m -CONFIG_INET6_XFRM_MODE_TUNNEL=m -CONFIG_INET6_XFRM_MODE_BEET=m -CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m CONFIG_IPV6_VTI=m CONFIG_IPV6_SIT=m CONFIG_IPV6_GRE=m diff --git a/arch/s390/configs/performance_defconfig b/arch/s390/configs/performance_defconfig index 09aa5cb..bf0f33c 100644 --- a/arch/s390/configs/performance_defconfig +++ b/arch/s390/configs/performance_defconfig @@ -118,9 +118,6 @@ CONFIG_NET_IPVTI=m CONFIG_INET_AH=m CONFIG_INET_ESP=m CONFIG_INET_IPCOMP=m -CONFIG_INET_XFRM_MODE_TRANSPORT=m -CONFIG_INET_XFRM_MODE_TUNNEL=m -CONFIG_INET_XFRM_MODE_BEET=m CONFIG_INET_DIAG=m CONFIG_INET_UDP_DIAG=m CONFIG_TCP_CONG_ADVANCED=y @@ -136,10 +133,6 @@ CONFIG_INET6_AH=m CONFIG_INET6_ESP=m CONFIG_INET6_IPCOMP=m CONFIG_IPV6_MIP6=m -CONFIG_INET6_XFRM_MODE_TRANSPORT=m -CONFIG_INET6_XFRM_MODE_TUNNEL=m -CONFIG_INET6_XFRM_MODE_BEET=m -CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m CONFIG_IPV6_VTI=m CONFIG_IPV6_SIT=m CONFIG_IPV6_GRE=m diff --git a/arch/sh/configs/ap325rxa_defconfig b/arch/sh/configs/ap325rxa_defconfig index cc6e4ce..b0ab56d 100644 --- a/arch/sh/configs/ap325rxa_defconfig +++ b/arch/sh/configs/ap325rxa_defconfig @@ -24,9 +24,6 @@ CONFIG_INET=y CONFIG_IP_ADVANCED_ROUTER=y CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_IPV6 is not set CONFIG_MTD=y CONFIG_MTD_CMDLINE_PARTS=y diff --git a/arch/sh/configs/ecovec24-romimage_defconfig b/arch/sh/configs/ecovec24-romimage_defconfig index 5c60e71..743025f 100644 --- a/arch/sh/configs/ecovec24-romimage_defconfig +++ b/arch/sh/configs/ecovec24-romimage_defconfig @@ -21,9 +21,6 @@ CONFIG_NET=y CONFIG_PACKET=y CONFIG_UNIX=y CONFIG_INET=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_INET_DIAG is not set # CONFIG_IPV6 is not set CONFIG_SCSI=y diff --git a/arch/sh/configs/ecovec24_defconfig b/arch/sh/configs/ecovec24_defconfig index 2fb7db4..ffb775a 100644 --- a/arch/sh/configs/ecovec24_defconfig +++ b/arch/sh/configs/ecovec24_defconfig @@ -25,9 +25,6 @@ CONFIG_INET=y CONFIG_IP_ADVANCED_ROUTER=y CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_IPV6 is not set CONFIG_IRDA=y CONFIG_SH_SIR=y diff --git a/arch/sh/configs/edosk7760_defconfig b/arch/sh/configs/edosk7760_defconfig index 02ba622..760d0b1 100644 --- a/arch/sh/configs/edosk7760_defconfig +++ b/arch/sh/configs/edosk7760_defconfig @@ -27,9 +27,6 @@ CONFIG_UNIX=y CONFIG_INET=y CONFIG_IP_PNP=y CONFIG_IP_PNP_BOOTP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_IPV6 is not set # CONFIG_FW_LOADER is not set CONFIG_DEBUG_DRIVER=y diff --git a/arch/sh/configs/kfr2r09-romimage_defconfig b/arch/sh/configs/kfr2r09-romimage_defconfig index 04436b4..5facda3 100644 --- a/arch/sh/configs/kfr2r09-romimage_defconfig +++ b/arch/sh/configs/kfr2r09-romimage_defconfig @@ -22,9 +22,6 @@ CONFIG_NET=y CONFIG_PACKET=y CONFIG_UNIX=y CONFIG_INET=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_INET_DIAG is not set # CONFIG_IPV6 is not set # CONFIG_WIRELESS is not set diff --git a/arch/sh/configs/kfr2r09_defconfig b/arch/sh/configs/kfr2r09_defconfig index 1dc3f67..35ad3b0 100644 --- a/arch/sh/configs/kfr2r09_defconfig +++ b/arch/sh/configs/kfr2r09_defconfig @@ -29,9 +29,6 @@ CONFIG_NET=y CONFIG_PACKET=y CONFIG_UNIX=y CONFIG_INET=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_INET_DIAG is not set # CONFIG_IPV6 is not set # CONFIG_WIRELESS is not set diff --git a/arch/sh/configs/magicpanelr2_defconfig b/arch/sh/configs/magicpanelr2_defconfig index 664c4de..547acf4 100644 --- a/arch/sh/configs/magicpanelr2_defconfig +++ b/arch/sh/configs/magicpanelr2_defconfig @@ -31,9 +31,6 @@ CONFIG_UNIX=y CONFIG_INET=y CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_IPV6 is not set # CONFIG_STANDALONE is not set # CONFIG_PREVENT_FIRMWARE_BUILD is not set diff --git a/arch/sh/configs/polaris_defconfig b/arch/sh/configs/polaris_defconfig index e3a1d3d..50697b4 100644 --- a/arch/sh/configs/polaris_defconfig +++ b/arch/sh/configs/polaris_defconfig @@ -33,9 +33,6 @@ CONFIG_PACKET=y CONFIG_UNIX=y CONFIG_INET=y CONFIG_IP_MULTICAST=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_IPV6 is not set CONFIG_MTD=y CONFIG_MTD_CMDLINE_PARTS=y diff --git a/arch/sh/configs/rsk7203_defconfig b/arch/sh/configs/rsk7203_defconfig index 10a32bd..9774815 100644 --- a/arch/sh/configs/rsk7203_defconfig +++ b/arch/sh/configs/rsk7203_defconfig @@ -40,9 +40,6 @@ CONFIG_NET=y CONFIG_INET=y CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_INET_DIAG is not set # CONFIG_IPV6 is not set # CONFIG_STANDALONE is not set diff --git a/arch/sh/configs/rsk7264_defconfig b/arch/sh/configs/rsk7264_defconfig index 2b0572b..b30d50d 100644 --- a/arch/sh/configs/rsk7264_defconfig +++ b/arch/sh/configs/rsk7264_defconfig @@ -31,9 +31,6 @@ CONFIG_NET=y CONFIG_INET=y CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_INET_DIAG is not set # CONFIG_IPV6 is not set # CONFIG_PREVENT_FIRMWARE_BUILD is not set diff --git a/arch/sh/configs/rsk7269_defconfig b/arch/sh/configs/rsk7269_defconfig index fb9fa7f..fa88c2a 100644 --- a/arch/sh/configs/rsk7269_defconfig +++ b/arch/sh/configs/rsk7269_defconfig @@ -20,9 +20,6 @@ CONFIG_NET=y CONFIG_INET=y CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_INET_DIAG is not set # CONFIG_IPV6 is not set # CONFIG_FW_LOADER is not set diff --git a/arch/sh/configs/sdk7780_defconfig b/arch/sh/configs/sdk7780_defconfig index d10a041..6ef6711 100644 --- a/arch/sh/configs/sdk7780_defconfig +++ b/arch/sh/configs/sdk7780_defconfig @@ -37,9 +37,7 @@ CONFIG_IP_MULTICAST=y CONFIG_IP_ADVANCED_ROUTER=y CONFIG_IP_PNP=y CONFIG_IP_PNP_BOOTP=y -# CONFIG_INET_XFRM_MODE_BEET is not set CONFIG_IPV6=y -# CONFIG_INET6_XFRM_MODE_BEET is not set CONFIG_NET_SCHED=y CONFIG_PARPORT=y CONFIG_BLK_DEV_LOOP=y diff --git a/arch/sh/configs/se7206_defconfig b/arch/sh/configs/se7206_defconfig index a93402b..0dc7228 100644 --- a/arch/sh/configs/se7206_defconfig +++ b/arch/sh/configs/se7206_defconfig @@ -53,9 +53,6 @@ CONFIG_NET_KEY=y CONFIG_INET=y CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_INET_DIAG is not set # CONFIG_IPV6 is not set # CONFIG_STANDALONE is not set diff --git a/arch/sh/configs/se7724_defconfig b/arch/sh/configs/se7724_defconfig index 0e8d5cc..40b4d31 100644 --- a/arch/sh/configs/se7724_defconfig +++ b/arch/sh/configs/se7724_defconfig @@ -26,9 +26,6 @@ CONFIG_INET=y CONFIG_IP_ADVANCED_ROUTER=y CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_IPV6 is not set CONFIG_MTD=y CONFIG_MTD_CMDLINE_PARTS=y diff --git a/arch/sh/configs/se7780_defconfig b/arch/sh/configs/se7780_defconfig index ec32c82..f37bebd 100644 --- a/arch/sh/configs/se7780_defconfig +++ b/arch/sh/configs/se7780_defconfig @@ -25,9 +25,6 @@ CONFIG_INET=y CONFIG_IP_MULTICAST=y CONFIG_IP_PNP=y CONFIG_IPV6=y -# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET6_XFRM_MODE_TUNNEL is not set -# CONFIG_INET6_XFRM_MODE_BEET is not set # CONFIG_IPV6_SIT is not set # CONFIG_PREVENT_FIRMWARE_BUILD is not set CONFIG_MTD=y diff --git a/arch/sh/configs/secureedge5410_defconfig b/arch/sh/configs/secureedge5410_defconfig index 360592d..48cefea 100644 --- a/arch/sh/configs/secureedge5410_defconfig +++ b/arch/sh/configs/secureedge5410_defconfig @@ -14,9 +14,6 @@ CONFIG_SH_DMA_API=y CONFIG_PCI=y CONFIG_NET=y CONFIG_INET=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_INET_DIAG is not set # CONFIG_IPV6 is not set CONFIG_MTD=y diff --git a/arch/sh/configs/sh2007_defconfig b/arch/sh/configs/sh2007_defconfig index 99975db..01ebda6 100644 --- a/arch/sh/configs/sh2007_defconfig +++ b/arch/sh/configs/sh2007_defconfig @@ -38,9 +38,6 @@ CONFIG_IP_ROUTE_VERBOSE=y CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y CONFIG_NET_IPIP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_IPV6 is not set CONFIG_NETWORK_SECMARK=y CONFIG_NET_PKTGEN=y diff --git a/arch/x86/configs/i386_defconfig b/arch/x86/configs/i386_defconfig index 2b2481a..152fec5 100644 --- a/arch/x86/configs/i386_defconfig +++ b/arch/x86/configs/i386_defconfig @@ -82,9 +82,6 @@ CONFIG_IP_MROUTE=y CONFIG_IP_PIMSM_V1=y CONFIG_IP_PIMSM_V2=y CONFIG_SYN_COOKIES=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_INET_DIAG is not set CONFIG_TCP_CONG_ADVANCED=y # CONFIG_TCP_CONG_BIC is not set diff --git a/arch/x86/configs/x86_64_defconfig b/arch/x86/configs/x86_64_defconfig index e8829ab..5e85065 100644 --- a/arch/x86/configs/x86_64_defconfig +++ b/arch/x86/configs/x86_64_defconfig @@ -81,9 +81,6 @@ CONFIG_IP_MROUTE=y CONFIG_IP_PIMSM_V1=y CONFIG_IP_PIMSM_V2=y CONFIG_SYN_COOKIES=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_INET_DIAG is not set CONFIG_TCP_CONG_ADVANCED=y # CONFIG_TCP_CONG_BIC is not set diff --git a/arch/xtensa/configs/cadence_csp_defconfig b/arch/xtensa/configs/cadence_csp_defconfig index 62f32a9..bb1181f 100644 --- a/arch/xtensa/configs/cadence_csp_defconfig +++ b/arch/xtensa/configs/cadence_csp_defconfig @@ -51,9 +51,6 @@ CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y CONFIG_IP_PNP_BOOTP=y CONFIG_IP_PNP_RARP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_INET_DIAG is not set # CONFIG_IPV6 is not set # CONFIG_WIRELESS is not set
These Kconfig options has been removed in commit 4c145dce2601 ("xfrm: make xfrm modes builtin") So there is no point to keep it in defconfigs any longer. Signed-off-by: YueHaibing <yuehaibing@huawei.com> --- arch/arc/configs/axs101_defconfig | 3 --- arch/arc/configs/axs103_defconfig | 3 --- arch/arc/configs/axs103_smp_defconfig | 3 --- arch/arc/configs/haps_hs_defconfig | 3 --- arch/arc/configs/haps_hs_smp_defconfig | 3 --- arch/arc/configs/nps_defconfig | 3 --- arch/arc/configs/nsimosci_hs_smp_defconfig | 3 --- arch/arc/configs/tb10x_defconfig | 3 --- arch/arm/configs/acs5k_tiny_defconfig | 3 --- arch/arm/configs/am200epdkit_defconfig | 3 --- arch/arm/configs/aspeed_g4_defconfig | 6 ------ arch/arm/configs/aspeed_g5_defconfig | 6 ------ arch/arm/configs/at91_dt_defconfig | 6 ------ arch/arm/configs/cm_x300_defconfig | 3 --- arch/arm/configs/efm32_defconfig | 3 --- arch/arm/configs/ep93xx_defconfig | 3 --- arch/arm/configs/ezx_defconfig | 3 --- arch/arm/configs/h5000_defconfig | 3 --- arch/arm/configs/imote2_defconfig | 3 --- arch/arm/configs/imx_v4_v5_defconfig | 3 --- arch/arm/configs/imx_v6_v7_defconfig | 3 --- arch/arm/configs/iop13xx_defconfig | 3 --- arch/arm/configs/iop32x_defconfig | 3 --- arch/arm/configs/iop33x_defconfig | 3 --- arch/arm/configs/keystone_defconfig | 3 --- arch/arm/configs/lpc18xx_defconfig | 3 --- arch/arm/configs/lpc32xx_defconfig | 3 --- arch/arm/configs/lpd270_defconfig | 3 --- arch/arm/configs/magician_defconfig | 3 --- arch/arm/configs/mini2440_defconfig | 3 --- arch/arm/configs/moxart_defconfig | 3 --- arch/arm/configs/mps2_defconfig | 3 --- arch/arm/configs/mxs_defconfig | 3 --- arch/arm/configs/omap1_defconfig | 3 --- arch/arm/configs/palmz72_defconfig | 3 --- arch/arm/configs/pcm027_defconfig | 3 --- arch/arm/configs/pxa3xx_defconfig | 3 --- arch/arm/configs/qcom_defconfig | 3 --- arch/arm/configs/rpc_defconfig | 6 ------ arch/arm/configs/s3c2410_defconfig | 1 - arch/arm/configs/sama5_defconfig | 6 ------ arch/arm/configs/sunxi_defconfig | 3 --- arch/arm/configs/tango4_defconfig | 3 --- arch/arm/configs/tegra_defconfig | 2 -- arch/arm/configs/xcep_defconfig | 3 --- arch/hexagon/configs/comet_defconfig | 3 --- arch/m68k/configs/amcore_defconfig | 3 --- arch/m68k/configs/m5208evb_defconfig | 3 --- arch/m68k/configs/m5249evb_defconfig | 3 --- arch/m68k/configs/m5272c3_defconfig | 3 --- arch/m68k/configs/m5275evb_defconfig | 3 --- arch/m68k/configs/m5307c3_defconfig | 3 --- arch/m68k/configs/m5407c3_defconfig | 3 --- arch/mips/configs/ar7_defconfig | 3 --- arch/mips/configs/ath25_defconfig | 3 --- arch/mips/configs/ath79_defconfig | 3 --- arch/mips/configs/bcm63xx_defconfig | 3 --- arch/mips/configs/bigsur_defconfig | 3 --- arch/mips/configs/bmips_be_defconfig | 3 --- arch/mips/configs/bmips_stb_defconfig | 3 --- arch/mips/configs/capcella_defconfig | 3 --- arch/mips/configs/ci20_defconfig | 3 --- arch/mips/configs/db1xxx_defconfig | 1 - arch/mips/configs/decstation_64_defconfig | 4 ---- arch/mips/configs/decstation_defconfig | 4 ---- arch/mips/configs/decstation_r4k_defconfig | 4 ---- arch/mips/configs/fuloong2e_defconfig | 2 -- arch/mips/configs/gpr_defconfig | 3 --- arch/mips/configs/ip22_defconfig | 4 ---- arch/mips/configs/ip27_defconfig | 7 ------- arch/mips/configs/ip28_defconfig | 3 --- arch/mips/configs/jazz_defconfig | 2 -- arch/mips/configs/jmr3927_defconfig | 3 --- arch/mips/configs/lasat_defconfig | 3 --- arch/mips/configs/lemote2f_defconfig | 3 --- arch/mips/configs/loongson1b_defconfig | 3 --- arch/mips/configs/loongson1c_defconfig | 3 --- arch/mips/configs/malta_defconfig | 2 -- arch/mips/configs/malta_kvm_defconfig | 2 -- arch/mips/configs/malta_kvm_guest_defconfig | 2 -- arch/mips/configs/maltaup_xpa_defconfig | 2 -- arch/mips/configs/markeins_defconfig | 4 ---- arch/mips/configs/mpc30x_defconfig | 3 --- arch/mips/configs/mtx1_defconfig | 4 ---- arch/mips/configs/nlm_xlp_defconfig | 7 ------- arch/mips/configs/nlm_xlr_defconfig | 7 ------- arch/mips/configs/omega2p_defconfig | 3 --- arch/mips/configs/pistachio_defconfig | 6 ------ arch/mips/configs/qi_lb60_defconfig | 3 --- arch/mips/configs/rb532_defconfig | 3 --- arch/mips/configs/rbtx49xx_defconfig | 3 --- arch/mips/configs/rm200_defconfig | 4 ---- arch/mips/configs/rt305x_defconfig | 3 --- arch/mips/configs/sb1250_swarm_defconfig | 3 --- arch/mips/configs/tb0219_defconfig | 3 --- arch/mips/configs/tb0226_defconfig | 3 --- arch/mips/configs/tb0287_defconfig | 3 --- arch/mips/configs/vocore2_defconfig | 3 --- arch/mips/configs/workpad_defconfig | 3 --- arch/mips/configs/xway_defconfig | 3 --- arch/nios2/configs/10m50_defconfig | 3 --- arch/nios2/configs/3c120_defconfig | 3 --- arch/openrisc/configs/or1ksim_defconfig | 3 --- arch/openrisc/configs/simple_smp_defconfig | 3 --- arch/parisc/configs/c8000_defconfig | 1 - arch/parisc/configs/generic-32bit_defconfig | 3 --- arch/parisc/configs/generic-64bit_defconfig | 3 --- arch/powerpc/configs/40x/acadia_defconfig | 3 --- arch/powerpc/configs/40x/ep405_defconfig | 3 --- arch/powerpc/configs/40x/kilauea_defconfig | 3 --- arch/powerpc/configs/40x/makalu_defconfig | 3 --- arch/powerpc/configs/40x/obs600_defconfig | 3 --- arch/powerpc/configs/40x/walnut_defconfig | 3 --- arch/powerpc/configs/44x/akebono_defconfig | 3 --- arch/powerpc/configs/44x/arches_defconfig | 3 --- arch/powerpc/configs/44x/bamboo_defconfig | 3 --- arch/powerpc/configs/44x/canyonlands_defconfig | 3 --- arch/powerpc/configs/44x/currituck_defconfig | 3 --- arch/powerpc/configs/44x/ebony_defconfig | 3 --- arch/powerpc/configs/44x/eiger_defconfig | 3 --- arch/powerpc/configs/44x/fsp2_defconfig | 3 --- arch/powerpc/configs/44x/icon_defconfig | 3 --- arch/powerpc/configs/44x/iss476-smp_defconfig | 3 --- arch/powerpc/configs/44x/katmai_defconfig | 3 --- arch/powerpc/configs/44x/rainier_defconfig | 3 --- arch/powerpc/configs/44x/redwood_defconfig | 3 --- arch/powerpc/configs/44x/sam440ep_defconfig | 3 --- arch/powerpc/configs/44x/sequoia_defconfig | 3 --- arch/powerpc/configs/44x/taishan_defconfig | 3 --- arch/powerpc/configs/52xx/pcm030_defconfig | 3 --- arch/powerpc/configs/83xx/kmeter1_defconfig | 3 --- arch/powerpc/configs/83xx/mpc837x_rdb_defconfig | 3 --- arch/powerpc/configs/85xx/ge_imp3a_defconfig | 1 - arch/powerpc/configs/85xx/xes_mpc85xx_defconfig | 3 --- arch/powerpc/configs/adder875_defconfig | 3 --- arch/powerpc/configs/amigaone_defconfig | 3 --- arch/powerpc/configs/cell_defconfig | 2 -- arch/powerpc/configs/chrp32_defconfig | 3 --- arch/powerpc/configs/ep88xc_defconfig | 3 --- arch/powerpc/configs/gamecube_defconfig | 3 --- arch/powerpc/configs/mpc512x_defconfig | 3 --- arch/powerpc/configs/mpc885_ads_defconfig | 3 --- arch/powerpc/configs/pmac32_defconfig | 2 -- arch/powerpc/configs/powernv_defconfig | 3 --- arch/powerpc/configs/ppc40x_defconfig | 3 --- arch/powerpc/configs/ppc44x_defconfig | 3 --- arch/powerpc/configs/ppc6xx_defconfig | 4 ---- arch/powerpc/configs/ps3_defconfig | 3 --- arch/powerpc/configs/skiroot_defconfig | 3 --- arch/powerpc/configs/storcenter_defconfig | 3 --- arch/powerpc/configs/tqm8xx_defconfig | 3 --- arch/powerpc/configs/wii_defconfig | 3 --- arch/s390/configs/debug_defconfig | 7 ------- arch/s390/configs/performance_defconfig | 7 ------- arch/sh/configs/ap325rxa_defconfig | 3 --- arch/sh/configs/ecovec24-romimage_defconfig | 3 --- arch/sh/configs/ecovec24_defconfig | 3 --- arch/sh/configs/edosk7760_defconfig | 3 --- arch/sh/configs/kfr2r09-romimage_defconfig | 3 --- arch/sh/configs/kfr2r09_defconfig | 3 --- arch/sh/configs/magicpanelr2_defconfig | 3 --- arch/sh/configs/polaris_defconfig | 3 --- arch/sh/configs/rsk7203_defconfig | 3 --- arch/sh/configs/rsk7264_defconfig | 3 --- arch/sh/configs/rsk7269_defconfig | 3 --- arch/sh/configs/sdk7780_defconfig | 2 -- arch/sh/configs/se7206_defconfig | 3 --- arch/sh/configs/se7724_defconfig | 3 --- arch/sh/configs/se7780_defconfig | 3 --- arch/sh/configs/secureedge5410_defconfig | 3 --- arch/sh/configs/sh2007_defconfig | 3 --- arch/x86/configs/i386_defconfig | 3 --- arch/x86/configs/x86_64_defconfig | 3 --- arch/xtensa/configs/cadence_csp_defconfig | 3 --- 174 files changed, 550 deletions(-)