hc
2024-01-05 071106ecf68c401173c58808b1cf5f68cc50d390
kernel/tools/testing/selftests/net/forwarding/lib.sh
....@@ -69,6 +69,17 @@
6969 fi
7070 }
7171
72
+skip_on_veth()
73
+{
74
+ local kind=$(ip -j -d link show dev ${NETIFS[p1]} |
75
+ jq -r '.[].linkinfo.info_kind')
76
+
77
+ if [[ $kind == veth ]]; then
78
+ echo "SKIP: Test cannot be run with veth pairs"
79
+ exit $ksft_skip
80
+ fi
81
+}
82
+
7283 if [[ "$(id -u)" -ne 0 ]]; then
7384 echo "SKIP: need root privileges"
7485 exit 0
....@@ -120,6 +131,11 @@
120131
121132 for ((i = 1; i <= NUM_NETIFS; ++i)); do
122133 local j=$((i+1))
134
+
135
+ if [ -z ${NETIFS[p$i]} ]; then
136
+ echo "SKIP: Cannot create interface. Name not specified"
137
+ exit $ksft_skip
138
+ fi
123139
124140 ip link show dev ${NETIFS[p$i]} &> /dev/null
125141 if [[ $? -ne 0 ]]; then
....@@ -731,14 +747,14 @@
731747 local value=$1; shift
732748
733749 SYSCTL_ORIG[$key]=$(sysctl -n $key)
734
- sysctl -qw $key=$value
750
+ sysctl -qw $key="$value"
735751 }
736752
737753 sysctl_restore()
738754 {
739755 local key=$1; shift
740756
741
- sysctl -qw $key=${SYSCTL_ORIG["$key"]}
757
+ sysctl -qw $key="${SYSCTL_ORIG[$key]}"
742758 }
743759
744760 forwarding_enable()