Commit 66077060 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'mlxsw-selftests-Few-small-updates' 



Ido Schimmel says:

====================
mlxsw: selftests: Few small updates

First patch fixes a typo in mlxsw.

Second patch fixes a race in a recent test.

Third patch makes a recent test executable.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents a26b0b53 97015259

drivers/net/ethernet/mellanox/mlxsw/pci_hw.h

+1 −1
Original line number Diff line number Diff line
@@ -221,7 +221,7 @@ MLXSW_ITEM32(pci, eqe, event_type, 0x0C, 24, 8); 
MLXSW_ITEM32(pci, eqe, event_sub_type, 0x0C, 16, 8);



/* pci_eqe_cqn

 * Completion Queue that triggeret this EQE.

 * Completion Queue that triggered this EQE.

 */

MLXSW_ITEM32(pci, eqe, cqn, 0x0C, 8, 7);

tools/testing/selftests/drivers/net/mlxsw/qos_mc_aware.sh

100644 → 100755
+0 −0

File mode changed from 100644 to 100755.

View file

tools/testing/selftests/net/forwarding/lib.sh

+1 −1
Original line number Diff line number Diff line
@@ -251,7 +251,7 @@ lldpad_app_wait_set() 
{

	local dev=$1; shift



	while lldptool -t -i $dev -V APP -c app | grep -q pending; do

	while lldptool -t -i $dev -V APP -c app | grep -Eq "pending|unknown"; do

		echo "$dev: waiting for lldpad to push pending APP updates"

		sleep 5

	done