Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 6d62a66e4211546f9e5c5d1ad586749a51cf30db

Authored by David S. Miller
1 parent 77e1e438cb
Exists in master and in 38 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

net: Default UDP and UNIX diag to 'n'. 

Signed-off-by: David S. Miller <davem@davemloft.net>

Showing 2 changed files with 6 additions and 2 deletions Side-by-side Diff

... ... @@ -410,8 +410,12 @@
410 410 def_tristate INET_DIAG
411 411  
412 412 config INET_UDP_DIAG
  413 + tristate "UDP: socket monitoring interface"
413 414 depends on INET_DIAG
414   - def_tristate INET_DIAG && IPV6
  415 + default n
  416 + ---help---
  417 + Support for UDP socket monitoring interface used by the ss tool.
  418 + If unsure, say Y.
415 419  
416 420 menuconfig TCP_CONG_ADVANCED
417 421 bool "TCP: advanced congestion control"
... ... @@ -22,7 +22,7 @@
22 22 config UNIX_DIAG
23 23 tristate "UNIX: socket monitoring interface"
24 24 depends on UNIX
25   - default UNIX
  25 + default n
26 26 ---help---
27 27 Support for UNIX socket monitoring interface used by the ss tool.
28 28 If unsure, say Y.