shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-05 10:31:46 +09:00
Code Issues Packages Projects Releases Wiki Activity

ANDROID: selftests: fcnal-test: Fix UPSTREAM related merge error

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

En-route to v6.1-rc1, merge 74b50ecaba ("Merge 0326074ff4 ("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: 74b50ecaba ("Merge 0326074ff4 ("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
This commit is contained in:
Lee Jones
2022-10-24 16:08:30 +01:00
parent 20ba031cf8
commit e37cc4db61
1 changed files with 0 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
tools/testing/selftests/net/fcnal-test.sh
View File

@@ -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
#