diff mbox series

[G,SRU,1/1] Revert "UBUNTU: SAUCE: selftests: net: ip_defrag: modprobe missing nf_defrag_ipv6 support"

Message ID 20200903082813.25646-2-po-hsu.lin@canonical.com
State New
Headers show
Series Remove duplicated code in ip_defrag.sh of kselftests/net | expand

Commit Message

Po-Hsu Lin Sept. 3, 2020, 8:28 a.m. UTC
BugLink: https://bugs.launchpad.net/bugs/1894062

The change to modprobe nf_defrag_ipv6 module has been applied again
with commit aba69d49 ("selftests: net: ip_defrag: modprobe missing
nf_defrag_ipv6 support")

Remove the duplicated code to make it match with upstream.

This reverts commit 6c6ab125655c04f81e244270985b077edd47fff1.

Signed-off-by: Po-Hsu Lin <po-hsu.lin@canonical.com>
---
 tools/testing/selftests/net/ip_defrag.sh | 2 --
 1 file changed, 2 deletions(-)

Comments

Colin Ian King Sept. 3, 2020, 8:44 a.m. UTC | #1
On 03/09/2020 09:28, Po-Hsu Lin wrote:
> BugLink: https://bugs.launchpad.net/bugs/1894062
> 
> The change to modprobe nf_defrag_ipv6 module has been applied again
> with commit aba69d49 ("selftests: net: ip_defrag: modprobe missing
> nf_defrag_ipv6 support")
> 
> Remove the duplicated code to make it match with upstream.
> 
> This reverts commit 6c6ab125655c04f81e244270985b077edd47fff1.
> 
> Signed-off-by: Po-Hsu Lin <po-hsu.lin@canonical.com>
> ---
>  tools/testing/selftests/net/ip_defrag.sh | 2 --
>  1 file changed, 2 deletions(-)
> 
> diff --git a/tools/testing/selftests/net/ip_defrag.sh b/tools/testing/selftests/net/ip_defrag.sh
> index ad97946..ceb7ad4 100755
> --- a/tools/testing/selftests/net/ip_defrag.sh
> +++ b/tools/testing/selftests/net/ip_defrag.sh
> @@ -3,8 +3,6 @@
>  #
>  # Run a couple of IP defragmentation tests.
>  
> -modprobe -q nf_defrag_ipv6
> -
>  set +x
>  set -e
>  
> 
Thanks, Looks good to me.

Acked-by: Colin Ian King <colin.king@canonical.com>
diff mbox series

Patch

diff --git a/tools/testing/selftests/net/ip_defrag.sh b/tools/testing/selftests/net/ip_defrag.sh
index ad97946..ceb7ad4 100755
--- a/tools/testing/selftests/net/ip_defrag.sh
+++ b/tools/testing/selftests/net/ip_defrag.sh
@@ -3,8 +3,6 @@ 
 #
 # Run a couple of IP defragmentation tests.
 
-modprobe -q nf_defrag_ipv6
-
 set +x
 set -e