Merge pull request #266 from Mellanox/master_devel

Merging master_devel to master for release 4.13.3-2

Author: mataneli94

mlxlink/modules/mlxlink_commander.cpp

@@ -1938,14 +1938,15 @@ void MlxlinkCommander::showPcieLinks()
             throw MlxRegException("No valid DPN's detected!");
         }
         setPrintTitle(_validPcieLinks,"Valid PCIe Links", _validDpns.size()+1);
-        setPrintVal(_validPcieLinks, 0," ", "depth, pcie_index, node, port");
+        setPrintVal(_validPcieLinks, 0, "Legend",
+                "depth, pcie_index, node, port", ANSI_COLOR_RESET, true, true, true);
         for(u_int32_t i = 0; i < _validDpns.size(); i++) {
             char dpnStr [20];
             int localPort  = getLocalPortFromMPIR(_validDpns[i]);
             sprintf(dpnStr,"%d, %d, %d, %d", _validDpns[i].depth,
                     _validDpns[i].pcieIndex, _validDpns[i].node, localPort);
             setPrintVal(_validPcieLinks, i+1, "Link " + to_string(i+1), dpnStr,
-                    ANSI_COLOR_RESET, localPort >= 0 );
+                    ANSI_COLOR_RESET, localPort >= 0, true, true);
         }
         cout << _validPcieLinks;
     } catch (const std::exception &exc) {

mlxlink/modules/mlxlink_maps.cpp

@@ -396,6 +396,7 @@ MlxlinkMaps::MlxlinkMaps() {
     _ExtETHSpeed2Lanes[ETH_LINK_SPEED_EXT_XLAUI_4] = 4;
     _ExtETHSpeed2Lanes[ETH_LINK_SPEED_EXT_25GAUI_1] = 1;
     _ExtETHSpeed2Lanes[ETH_LINK_SPEED_EXT_50GAUI_2] = 2;
+    _ExtETHSpeed2Lanes[ETH_LINK_SPEED_EXT_50GAUI_1] = 1;
     _ExtETHSpeed2Lanes[ETH_LINK_SPEED_EXT_CAUI_4] = 4;
     _ExtETHSpeed2Lanes[ETH_LINK_SPEED_EXT_100GAUI_2] = 2;
     _ExtETHSpeed2Lanes[ETH_LINK_SPEED_EXT_200GAUI_4] = 4;

mstflint.spec.in

@@ -1,7 +1,7 @@
 %{!?ibmadlib: %define ibmadlib libibmad-devel}
 %{!?name: %define name mstflint}
 %{!?version: %define version 4.13.3}
-%{!?release: %define release 1}
+%{!?release: %define release 2}
 %{!?buildtype: %define buildtype "native"}
 %{!?noinband: %define noinband 0}
 %{!?nodc: %define nodc 0}