OSDN Git Service

vrf: Handle CONFIG_SYSCTL not set
authorDavid Ahern <dsahern@kernel.org>
Thu, 23 Jul 2020 23:23:09 +0000 (17:23 -0600)
committerDavid S. Miller <davem@davemloft.net>
Fri, 24 Jul 2020 00:51:04 +0000 (17:51 -0700)
commit1b6687e31a2df9fbdb12d25c1d1d372777bf96a8
tree35ec2b02315579a13fab4f8a7ed123af53aa05aa
parent5df5661a1387e829c901d009cdd1fccc376cdb74
vrf: Handle CONFIG_SYSCTL not set

Randy reported compile failure when CONFIG_SYSCTL is not set/enabled:

ERROR: modpost: "sysctl_vals" [drivers/net/vrf.ko] undefined!

Fix by splitting out the sysctl init and cleanup into helpers that
can be set to do nothing when CONFIG_SYSCTL is disabled. In addition,
move vrf_strict_mode and vrf_strict_mode_change to above
vrf_shared_table_handler (code move only) and wrap all of it
in the ifdef CONFIG_SYSCTL.

Update the strict mode tests to check for the existence of the
/proc/sys entry.

Fixes: 33306f1aaf82 ("vrf: add sysctl parameter for strict mode")
Cc: Andrea Mayer <andrea.mayer@uniroma2.it>
Reported-by: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: David Ahern <dsahern@kernel.org>
Acked-by: Randy Dunlap <rdunlap@infradead.org> # build-tested
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/vrf.c
tools/testing/selftests/net/vrf_strict_mode_test.sh