tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'fix-bridge_vlan_aware-sh-and-bridge_vlan_unaware-sh-with-iff_unicast_flt'

Vladimir Oltean says:

====================
Fix bridge_vlan_aware.sh and bridge_vlan_unaware.sh with IFF_UNICAST_FLT

Make sure that h1 and h2 don't drop packets with a random MAC DA, which
otherwise confuses these selftests. Also, fix an incorrect error message
found during those failures.
====================

Link: https://lore.kernel.org/r/20220703073626.937785-1-vladimir.oltean@nxp.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

Paolo Abeni 029cc096 7e8c182c

+5 -1
+5 -1
tools/testing/selftests/net/forwarding/lib.sh
··· 1240 1240 # FDB entry was installed. 1241 1241 bridge link set dev $br_port1 flood off 1242 1242 1243 + ip link set $host1_if promisc on 1243 1244 tc qdisc add dev $host1_if ingress 1244 1245 tc filter add dev $host1_if ingress protocol ip pref 1 handle 101 \ 1245 1246 flower dst_mac $mac action drop ··· 1251 1250 tc -j -s filter show dev $host1_if ingress \ 1252 1251 | jq -e ".[] | select(.options.handle == 101) \ 1253 1252 | select(.options.actions[0].stats.packets == 1)" &> /dev/null 1254 - check_fail $? "Packet reached second host when should not" 1253 + check_fail $? "Packet reached first host when should not" 1255 1254 1256 1255 $MZ $host1_if -c 1 -p 64 -a $mac -t ip -q 1257 1256 sleep 1 ··· 1290 1289 1291 1290 tc filter del dev $host1_if ingress protocol ip pref 1 handle 101 flower 1292 1291 tc qdisc del dev $host1_if ingress 1292 + ip link set $host1_if promisc off 1293 1293 1294 1294 bridge link set dev $br_port1 flood on 1295 1295 ··· 1308 1306 1309 1307 # Add an ACL on `host2_if` which will tell us whether the packet 1310 1308 # was flooded to it or not. 1309 + ip link set $host2_if promisc on 1311 1310 tc qdisc add dev $host2_if ingress 1312 1311 tc filter add dev $host2_if ingress protocol ip pref 1 handle 101 \ 1313 1312 flower dst_mac $mac action drop ··· 1326 1323 1327 1324 tc filter del dev $host2_if ingress protocol ip pref 1 handle 101 flower 1328 1325 tc qdisc del dev $host2_if ingress 1326 + ip link set $host2_if promisc off 1329 1327 1330 1328 return $err 1331 1329 }