diff --git a/[refs] b/[refs] index d318933eaa6c..d7fc7ee39f69 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e18f5feb0c851a0e77e315b3d9ef1c432b1a50ec +refs/heads/master: d18921a0e319ab512f8186b1b1142c7b8634c779 diff --git a/trunk/net/ipv4/Kconfig b/trunk/net/ipv4/Kconfig index c7a814860ce1..b2cf91e4ccaa 100644 --- a/trunk/net/ipv4/Kconfig +++ b/trunk/net/ipv4/Kconfig @@ -50,6 +50,8 @@ config IP_ADVANCED_ROUTER echo 1 > /proc/sys/net/ipv4/conf/all/rp_filter Note that some distributions enable it in startup scripts. + For details about rp_filter strict and loose mode read + . If unsure, say N here.