diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-07-27 12:42:15 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-07-27 12:42:15 +0200 |
| commit | 908e757daecf2120c3019fa630ae5d4c3cd7165b (patch) | |
| tree | 652b0f3ecd4a6d7c0066169d6ae466711300197c /tools/testing/selftests/net/ip_defrag.sh | |
| parent | 58b1d3f864b1f32521d60642e240face22e9ee68 (diff) | |
| parent | 92ed301919932f777713b9172e525674157e983d (diff) | |
| download | lwn-908e757daecf2120c3019fa630ae5d4c3cd7165b.tar.gz lwn-908e757daecf2120c3019fa630ae5d4c3cd7165b.zip | |
Merge 5.8-rc7 into staging-next
We need the staging fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'tools/testing/selftests/net/ip_defrag.sh')
| -rwxr-xr-x | tools/testing/selftests/net/ip_defrag.sh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/testing/selftests/net/ip_defrag.sh b/tools/testing/selftests/net/ip_defrag.sh index 15d3489ecd9c..ceb7ad4dbd94 100755 --- a/tools/testing/selftests/net/ip_defrag.sh +++ b/tools/testing/selftests/net/ip_defrag.sh @@ -6,6 +6,8 @@ set +x set -e +modprobe -q nf_defrag_ipv6 + readonly NETNS="ns-$(mktemp -u XXXXXX)" setup() { |