1 files changed, 14 insertions, 5 deletions
diff --git a/resources/libraries/bash/function/device.sh b/resources/libraries/bash/function/device.sh
index ee0ebdfd16..4d39cd2de6 100644
--- a/resources/libraries/bash/function/device.sh
+++ b/resources/libraries/bash/function/device.sh
@@ -173,13 +173,17 @@ function clean_environment () {
     }
 
     # Rebind interfaces back to kernel drivers.
+    i=0
     for ADDR in ${TG_PCIDEVS[@]}; do
-        DRIVER="${TG_DRIVERS[0]}"
+        DRIVER="${TG_DRIVERS[${i}]}"
         bind_interfaces_to_driver || die
+        ((i++))
     done
+    i=0
     for ADDR in ${DUT1_PCIDEVS[@]}; do
-        DRIVER="${DUT1_DRIVERS[0]}"
+        DRIVER="${DUT1_DRIVERS[${i}]}"
         bind_interfaces_to_driver || die
+        ((i++))
     done
 }
 
@@ -315,9 +319,11 @@ function get_available_interfaces () {
        "1n_alt")
             # Add Intel Corporation XL710/X710 Virtual Function to the
             # whitelist.
-            pci_id="0x154c"
-            tg_netdev=(enp1s0f0 enp1s0f1)
-            dut1_netdev=(enP3p2s0f0 enP3p2s0f1)
+            # Add MT2892 Family [ConnectX-6 Dx] Virtual Function to the
+            # whitelist.
+            pci_id="0x154c\|0x101e"
+            tg_netdev=(enp1s0f0 enp1s0f1 enP1p1s0f0)
+            dut1_netdev=(enP3p2s0f0 enP3p2s0f1 enP1p1s0f1)
             ports_per_nic=2
             ;;
         "1n_spr")
@@ -503,6 +509,9 @@ function get_csit_model () {
             "0x1572"|"0x154c")
                 MODEL="Intel-X710"
                 ;;
+            "0x101e")
+                MODEL="Mellanox-CX6DX"
+                ;;
             *)
                 MODEL="virtual"
         esac