diff options
| author | Paolo Abeni <[email protected]> | 2024-10-21 07:14:18 +0000 |
|---|---|---|
| committer | Paolo Abeni <[email protected]> | 2024-10-21 07:14:18 +0000 |
| commit | 91afa49a3eda8ebf902ce68f02cb16b48c879b6a (patch) | |
| tree | 3ceca7290ee7358c8e647b27f992604ce9c7ec20 /tools/testing/selftests/net/rds/test.py | |
| parent | net: ftgmac100: correct the phy interface of NC-SI mode (diff) | |
| parent | Merge tag 'net-6.12-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/net... (diff) | |
| download | kernel-91afa49a3eda8ebf902ce68f02cb16b48c879b6a.tar.gz kernel-91afa49a3eda8ebf902ce68f02cb16b48c879b6a.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR (net-6.12-rc4).
Conflicts:
107a034d5c1e ("net/mlx5: qos: Store rate groups in a qos domain")
1da9cfd6c41c ("net/mlx5: Unregister notifier on eswitch init failure")
Signed-off-by: Paolo Abeni <[email protected]>
Diffstat (limited to 'tools/testing/selftests/net/rds/test.py')
| -rwxr-xr-x | tools/testing/selftests/net/rds/test.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tools/testing/selftests/net/rds/test.py b/tools/testing/selftests/net/rds/test.py index e6bb109bcead..4a7178d11193 100755 --- a/tools/testing/selftests/net/rds/test.py +++ b/tools/testing/selftests/net/rds/test.py @@ -14,8 +14,11 @@ import sys import atexit from pwd import getpwuid from os import stat -from lib.py import ip +# Allow utils module to be imported from different directory +this_dir = os.path.dirname(os.path.realpath(__file__)) +sys.path.append(os.path.join(this_dir, "../")) +from lib.py.utils import ip libc = ctypes.cdll.LoadLibrary('libc.so.6') setns = libc.setns |