Skip to content

Commit c3e6ddd

Browse files
committed
selftests: forwarding: lib: Split sysctl_save() out of sysctl_set()
JIRA: https://issues.redhat.com/browse/RHEL-59087 commit 6f51aed Author: Petr Machata <petrm@nvidia.com> Date: Fri Jun 7 17:13:56 2024 +0200 selftests: forwarding: lib: Split sysctl_save() out of sysctl_set() In order to be able to save the current value of a sysctl without changing it, split the relevant bit out of sysctl_set() into a new helper. Signed-off-by: Petr Machata <petrm@nvidia.com> Reviewed-by: Ido Schimmel <idosch@nvidia.com> Reviewed-by: Nikolay Aleksandrov <razor@blackwall.org> Reviewed-by: David Ahern <dsahern@kernel.org> Link: https://lore.kernel.org/r/20240607151357.421181-5-petrm@nvidia.com Signed-off-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: CKI Backport Bot <cki-ci-bot+cki-gitlab-backport-bot@redhat.com> Signed-off-by: Ivan Vecera <ivecera@redhat.com>
1 parent b2b69e4 commit c3e6ddd

File tree

1 file changed

+8
-1
lines changed
  • tools/testing/selftests/net/forwarding

1 file changed

+8
-1
lines changed

tools/testing/selftests/net/forwarding/lib.sh

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -943,12 +943,19 @@ bridge_ageing_time_get()
943943
}
944944

945945
declare -A SYSCTL_ORIG
946+
sysctl_save()
947+
{
948+
local key=$1; shift
949+
950+
SYSCTL_ORIG[$key]=$(sysctl -n $key)
951+
}
952+
946953
sysctl_set()
947954
{
948955
local key=$1; shift
949956
local value=$1; shift
950957

951-
SYSCTL_ORIG[$key]=$(sysctl -n $key)
958+
sysctl_save "$key"
952959
sysctl -qw $key="$value"
953960
}
954961

0 commit comments

Comments
 (0)