From e37cc4db61c827c9960980f9634bbb6dd62b4aa8 Mon Sep 17 00:00:00 2001
From: Lee Jones <joneslee@google.com>
Date: Mon, 24 Oct 2022 16:08:30 +0100
Subject: [PATCH] ANDROID: selftests: fcnal-test: Fix UPSTREAM related merge
 error

Commit 0f0ddc32df2c1 ("UPSTREAM: ipv4: ping: fix bind address validity
check") was cherry-picked into android-mainline from upstream commit
b4a028c4d031c ("ipv4: ping: fix bind address validity check").

En-route to v6.1-rc1, merge 74b50ecabac61 ("Merge 0326074ff465 ("Merge
tag 'net-next-6.1' of
git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next") into
android-mainline") then accidentally re-added the diff, leaving 2
identical hunks next to one another.

This patch removes the superfluous hunks.

Fixes: 74b50ecabac61 ("Merge 0326074ff465 ("Merge tag 'net-next-6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next") into android-mainline")
Signed-off-by: Lee Jones <joneslee@google.com>
Change-Id: I9570582cb269a93e58a5fb2dbf14f2413fd6074d
---
 tools/testing/selftests/net/fcnal-test.sh | 26 -----------------------
 1 file changed, 26 deletions(-)

diff --git a/tools/testing/selftests/net/fcnal-test.sh b/tools/testing/selftests/net/fcnal-test.sh
index 6cdf6237cf19..31c3b6ebd388 100755
--- a/tools/testing/selftests/net/fcnal-test.sh
+++ b/tools/testing/selftests/net/fcnal-test.sh
@@ -1851,19 +1851,6 @@ ipv4_addr_bind_novrf()
 	run_cmd nettest -s -D -P icmp -l ${a} -b
 	log_test_addr ${a} $? 1 "ICMP socket bind to multicast address"
 
-	#
-	# check that ICMP sockets cannot bind to broadcast and multicast addresses
-	#
-	a=${BCAST_IP}
-	log_start
-	run_cmd nettest -s -R -P icmp -l ${a} -b
-	log_test_addr ${a} $? 1 "ICMP socket bind to broadcast address"
-
-	a=${MCAST_IP}
-	log_start
-	run_cmd nettest -s -R -P icmp -f -l ${a} -b
-	log_test_addr ${a} $? 1 "ICMP socket bind to multicast address"
-
 	#
 	# tcp sockets
 	#
@@ -1942,19 +1929,6 @@ ipv4_addr_bind_vrf()
 	run_cmd nettest -s -D -P icmp -l ${a} -I ${VRF} -b
 	log_test_addr ${a} $? 1 "ICMP socket bind to multicast address after VRF bind"
 
-	#
-	# check that ICMP sockets cannot bind to broadcast and multicast addresses
-	#
-	a=${BCAST_IP}
-	log_start
-	run_cmd nettest -s -R -P icmp -l ${a} -I ${VRF} -b
-	log_test_addr ${a} $? 1 "ICMP socket bind to broadcast address after VRF bind"
-
-	a=${MCAST_IP}
-	log_start
-	run_cmd nettest -s -R -P icmp -f -l ${a} -I ${VRF} -b
-	log_test_addr ${a} $? 1 "ICMP socket bind to multicast address after VRF bind"
-
 	#
 	# tcp sockets
 	#