diff options
| author | David S. Miller <davem@davemloft.net> | 2018-10-10 22:22:40 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-10-10 22:22:40 -0700 |
| commit | 66077060f82a69e8dde0262a20a37622a6e1af8c (patch) | |
| tree | fe311d5cee7c57368c6de4c873f010673fe6b4b9 | |
| parent | a26b0b53cc38eb414c1d7a327bfd63cb357cebf9 (diff) | |
| parent | 970152591d5552fb52ddbf50af8d26b61f02bf39 (diff) | |
| download | linux-66077060f82a69e8dde0262a20a37622a6e1af8c.tar.bz2 | |
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: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlxsw/pci_hw.h | 2 | ||||
| -rwxr-xr-x[-rw-r--r--] | tools/testing/selftests/drivers/net/mlxsw/qos_mc_aware.sh | 0 | ||||
| -rw-r--r-- | tools/testing/selftests/net/forwarding/lib.sh | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/mellanox/mlxsw/pci_hw.h b/drivers/net/ethernet/mellanox/mlxsw/pci_hw.h index 83f452b7ccbb..bb99f6d41fe0 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/pci_hw.h +++ b/drivers/net/ethernet/mellanox/mlxsw/pci_hw.h @@ -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); diff --git a/tools/testing/selftests/drivers/net/mlxsw/qos_mc_aware.sh b/tools/testing/selftests/drivers/net/mlxsw/qos_mc_aware.sh index 0150bb2741eb..0150bb2741eb 100644..100755 --- a/tools/testing/selftests/drivers/net/mlxsw/qos_mc_aware.sh +++ b/tools/testing/selftests/drivers/net/mlxsw/qos_mc_aware.sh diff --git a/tools/testing/selftests/net/forwarding/lib.sh b/tools/testing/selftests/net/forwarding/lib.sh index 0e73698b2048..85d253546684 100644 --- a/tools/testing/selftests/net/forwarding/lib.sh +++ b/tools/testing/selftests/net/forwarding/lib.sh @@ -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 |